diff --git a/.gitignore b/.gitignore
index 5b61ab0..5d402a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@
 # Ignore bundler config.
 /.bundle
 
+/config/initializers/app_keys.rb
+
 # Ignore all logfiles and tempfiles.
 /log/*
 !/log/.keep
diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..4e1e0d2
--- /dev/null
+++ b/.rspec
@@ -0,0 +1 @@
+--color
diff --git a/Gemfile b/Gemfile
index 0f2b178..22eab39 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'rails', '4.2.6'
 # Use postgresql as the database for Active Record
 gem 'pg', '~> 0.15'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
+gem 'sass-rails'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
@@ -30,9 +30,20 @@ gem "faker", github: "stympy/faker"
 gem 'interactive_editor'
 gem 'awesome_print'
 gem 'hirb'
+gem 'will_paginate'
+gem 'kaminari'
+gem 'rails_12factor', group: :production
+gem 'cancancan'
+gem 'bootstrap-sass'
+gem "font-awesome-rails"
+gem 'simple_form'
+gem 'ransack'
+
+gem 'omniauth-twitter'
+
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
+gem 'bcrypt', '~> 3.1.7'
 
 # Use Unicorn as the app server
 # gem 'unicorn'
@@ -44,6 +55,7 @@ gem 'hirb'
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
+  gem 'rspec-rails'
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 3e9faf5..55fc70f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/stympy/faker.git
-  revision: b05809e3839016d42e4d40bc4a28ac25326fe03a
+  revision: 3b4368a51ecafc21952f28d5456d1e19cf6b1454
   specs:
     faker (1.6.3)
       i18n (~> 0.5)
@@ -44,11 +44,18 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
+    autoprefixer-rails (6.3.7)
+      execjs
     awesome_print (1.7.0)
+    bcrypt (3.1.11)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     builder (3.2.2)
     byebug (9.0.5)
+    cancancan (1.15.0)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
@@ -59,11 +66,15 @@ GEM
     concurrent-ruby (1.0.2)
     cowsay (0.2.0)
     debug_inspector (0.0.2)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.7.0)
     ffi (1.9.10)
+    font-awesome-rails (4.6.3.1)
+      railties (>= 3.2, < 5.1)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
+    hashie (3.4.4)
     hirb (0.7.3)
     i18n (0.7.0)
     interactive_editor (0.0.10)
@@ -76,6 +87,9 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
+    kaminari (0.17.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -89,8 +103,20 @@ GEM
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
+    oauth (0.5.1)
+    omniauth (1.3.1)
+      hashie (>= 1.2, < 4)
+      rack (>= 1.0, < 3)
+    omniauth-oauth (1.1.0)
+      oauth
+      omniauth (~> 1.0)
+    omniauth-twitter (1.2.1)
+      json (~> 1.3)
+      omniauth-oauth (~> 1.1)
     pg (0.18.4)
     pkg-config (1.1.7)
+    polyamorous (1.3.1)
+      activerecord (>= 3.0)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -113,14 +139,42 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
+    rails_12factor (0.0.3)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.5)
+    rails_stdout_logging (0.0.5)
     railties (4.2.6)
       actionpack (= 4.2.6)
       activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.0)
+    rake (11.2.2)
+    ransack (1.8.0)
+      actionpack (>= 3.0)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+      i18n
+      polyamorous (~> 1.3)
     rdoc (4.2.2)
       json (~> 1.4)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.2)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     sass (3.4.22)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
@@ -131,10 +185,13 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    simple_form (3.2.1)
+      actionpack (> 4, < 5.1)
+      activemodel (> 4, < 5.1)
     spoon (0.0.4)
       ffi
     spring (1.7.1)
-    sprockets (3.6.0)
+    sprockets (3.6.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.0.4)
@@ -155,28 +212,40 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
+    will_paginate (3.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   awesome_print
+  bcrypt (~> 3.1.7)
+  bootstrap-sass
   byebug
+  cancancan
   coffee-rails (~> 4.1.0)
   cowsay
   faker!
+  font-awesome-rails
   hirb
   interactive_editor
   jbuilder (~> 2.0)
   jquery-rails
+  kaminari
+  omniauth-twitter
   pg (~> 0.15)
   rails (= 4.2.6)
-  sass-rails (~> 5.0)
+  rails_12factor
+  ransack
+  rspec-rails
+  sass-rails
   sdoc (~> 0.4.0)
+  simple_form
   spring
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
+  will_paginate
 
 BUNDLED WITH
    1.12.5
diff --git a/app/assets/images/weather.png b/app/assets/images/weather.png
new file mode 100644
index 0000000..8c4086f
Binary files /dev/null and b/app/assets/images/weather.png differ
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e07c5a8..7465856 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,4 +13,5 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
+//= require bootstrap-sprockets
 //= require_tree .
diff --git a/app/assets/javascripts/comments.coffee b/app/assets/javascripts/comments.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/comments.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/likes.coffee b/app/assets/javascripts/likes.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/likes.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/password_resets.coffee b/app/assets/javascripts/password_resets.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/password_resets.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/sessions.coffee b/app/assets/javascripts/sessions.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/sessions.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/users.coffee b/app/assets/javascripts/users.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/users.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index f9cd5b3..7482d23 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1,4 +1,4 @@
-/*
+  /*
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
  *
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.scss b/app/assets/stylesheets/bootstrap_and_overrides.scss
new file mode 100644
index 0000000..bda0285
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap_and_overrides.scss
@@ -0,0 +1,23 @@
+$brand-primary: #ffcc99;
+$border-radius-base: 0px;
+
+@import "bootstrap-sprockets";
+@import "bootstrap";
+
+abbr[title] {
+  cursor: default;
+}
+
+body{
+  font-size: 1.4em;
+  line-height: 1.5em;
+  font-family: "Open Sans", Helvetica, Arial, sans-serif;
+}
+
+.navbar{
+  padding-top: 10px;
+  background-color: darkblue;
+  position: fixed;
+  width: 100%;
+  top: 0;
+}
diff --git a/app/assets/stylesheets/comments.scss b/app/assets/stylesheets/comments.scss
new file mode 100644
index 0000000..3722c12
--- /dev/null
+++ b/app/assets/stylesheets/comments.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the comments controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss
index f0ddc68..afe2aba 100644
--- a/app/assets/stylesheets/home.scss
+++ b/app/assets/stylesheets/home.scss
@@ -1,3 +1,6 @@
 // Place all the styles related to the home controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+body {
+  background: url(image_path('weather.png'))
+}
diff --git a/app/assets/stylesheets/likes.scss b/app/assets/stylesheets/likes.scss
new file mode 100644
index 0000000..1f08d32
--- /dev/null
+++ b/app/assets/stylesheets/likes.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the likes controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/password_resets.scss b/app/assets/stylesheets/password_resets.scss
new file mode 100644
index 0000000..eb9649c
--- /dev/null
+++ b/app/assets/stylesheets/password_resets.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the PasswordResets controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss
new file mode 100644
index 0000000..ed7a765
--- /dev/null
+++ b/app/assets/stylesheets/scaffolds.scss
@@ -0,0 +1,73 @@
+body {
+  background-color: #fff;
+  color: #333;
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a {
+  color: #000;
+
+  &:visited {
+    color: #666;
+  }
+
+  &:hover {
+    color: #fff;
+    background-color: #000;
+  }
+}
+
+div {
+  &.field, &.actions {
+    margin-bottom: 10px;
+  }
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+
+  h2 {
+    text-align: left;
+    font-weight: bold;
+    padding: 5px 5px 5px 15px;
+    font-size: 12px;
+    margin: -7px;
+    margin-bottom: 0px;
+    background-color: #c00;
+    color: #fff;
+  }
+
+  ul li {
+    font-size: 12px;
+    list-style: square;
+  }
+}
diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss
new file mode 100644
index 0000000..7bef9cf
--- /dev/null
+++ b/app/assets/stylesheets/sessions.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the sessions controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss
new file mode 100644
index 0000000..1efc835
--- /dev/null
+++ b/app/assets/stylesheets/users.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the users controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d83690e..fb2dde9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,4 +2,33 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+
+  def authenticate_user
+    redirect_to new_session_path, alert: "Please sign in" unless user_signed_in?
+  end
+
+  def authorize_user
+    find_article
+    unless @article.user_id == current_user.id
+      flash[:notice] = "You are not the creator of this article, you don't have the permissions"
+      redirect_to root_path
+      return false
+    end
+  end
+
+  def current_user
+    @current_user ||= User.find_by_id(session[:user_id])
+    # @current_user ||= User.find_by_auth_token!(cookies[:auth_token]) if cookies[:auth_token]
+  end
+  helper_method :current_user
+
+  def user_signed_in?
+    current_user.present?
+  end
+
+  helper_method :user_signed_in?
+
+  def sign_in(user)
+    session[:user_id] = user.id
+  end
 end
diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
index 2d15b66..35c89bf 100644
--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -1,42 +1,61 @@
 class ArticlesController < ApplicationController
 
+before_action :authorize_user, only: [:edit, :update, :destroy]
+before_action :authenticate_user!, except: [:index, :show]
 before_action :find_article, only: [:show, :edit, :update, :destroy]
 
+
   def index
-    @articles = Article.order(created_at: :desc)
+    @articles = Article.all
+    @a = Article.ransack(params[:q])
+    @people = @a.result(distinct: true)
+    @articles = Article.order(:title).page params[:page]
   end
 
-  def edit
-  end
+def edit
+  redirect_to root_path, alert: "access defined" unless can? :edit, @article
+end
 
   def show
-    @article = Article.find(params[:id])
+    @comment = Comment.new
+    @like = @article.like_for(current_user)
   end
 
   def new
-
+    @article = Article.new
   end
 
   def create
-    @article = Article.new(article_params)
-    @article.save
-    redirect_to @article
+    @article = Article.new article_params
+    @article.user = current_user
+    if @article.save
+      flash[:notice] = "Article Created!"
+      redirect_to article_path(@article)
+    else
+      flash[:alert] = "Article not created!"
+      render :new
+    end
   end
 
   def update
+    redirect_to root_path, alert: "access denined" unless can? :update, @article
     if @article.update article_params
       redirect_to article_path(@article), notice: "Article Updated"
+    else
+      render :edit
     end
+
   end
 
   def destroy
+    redirect_to root_path, alert: "access denined" unless can? :destroy, @article
     @article.destroy
-    redirect_to article_path, notice: "Question Deleted"
+    redirect_to articles_path, notice: "Questions deleted"
   end
 
   private
     def article_params
-      params.require(:article).permit(:title, :text)
+      params.require(:article).permit(:title, :text, :category_id, :user_id, :tag_names)
     end
 
     def find_article
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
new file mode 100644
index 0000000..7121a97
--- /dev/null
+++ b/app/controllers/comments_controller.rb
@@ -0,0 +1,28 @@
+class CommentsController < ApplicationController
+  before_action :authorize_user, only: [:edit, :update, :destroy]
+
+  def create
+    @comment   = Comment.new comment_params
+    @article = Article.find params[:article_id]
+    @comment.article = @article
+    if @comment.save
+      redirect_to article_path(@article), notice: "Comment created!"
+    else
+      render "/article/show"
+    end
+
+    def destroy
+      comment = Comment.find params[:id]
+      article = Article.find params[:question_id]
+      redirect_to root_path, alert: "access denined" unless can? :destroy, @comment
+      comment.destroy
+      redirect_to article_path(article), notice: "Comment deleted"
+    end
+  end
+
+  private
+
+    def comment_params
+      params.require(:comment).permit(:body)
+    end
+end
diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
new file mode 100644
index 0000000..74a6a19
--- /dev/null
+++ b/app/controllers/likes_controller.rb
@@ -0,0 +1,22 @@
+class LikesController < ApplicationController
+  before_action :authenticate_user
+
+  def create
+    like = current_user.likes.new
+    article = Article.find params[:article_id]
+    like.article = article
+    if like.save
+      LikesMailer.notify_article_owner(like).deliver_now
+      redirect_to article, notice: "Liked!"
+    else
+      redirect_to article, notice: "Didn't Like!"
+    end
+  end
+
+  def destroy
+    article = Article.find params[:article_id]
+    like = current_user.likes.find params[:id]
+    like.destroy
+    redirect_to like.article, notice: "Unliked"
+  end
+end
diff --git a/app/controllers/password_resets_controller.rb b/app/controllers/password_resets_controller.rb
new file mode 100644
index 0000000..9f289e4
--- /dev/null
+++ b/app/controllers/password_resets_controller.rb
@@ -0,0 +1,33 @@
+class PasswordResetsController < ApplicationController
+  def new
+  end
+
+  def create
+    @user = User.find_by(email: params[:email])
+    if @user
+      # @user.create_reset_digest
+      @user.send_password_reset
+      flash[:info] = "Email sent with password reset instructions"
+      redirect_to root_url
+    else
+      flash.now[:danger] = "Email address not found"
+      render 'new'
+    end
+  end
+
+  def edit
+    @user = User.find_by_password_reset_token!(params[:id])
+  end
+
+  def update
+    @user = User.find_by_password_reset_token!(params[:id])
+    user_params = params.require(:user).permit(:password, :password_confirmation)
+    if @user.password_reset_sent_at < 3.days.ago
+      redirect_to new_password_reset_path, :alert => "Password reset has expired."
+    elsif @user.update user_params
+      redirect_to root_url, :notice => "Password has been reset!"
+    else
+      render :edit
+    end
+  end
+end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
new file mode 100644
index 0000000..95cb201
--- /dev/null
+++ b/app/controllers/sessions_controller.rb
@@ -0,0 +1,49 @@
+# class SessionsController < ApplicationController
+#   def new
+#   end
+#
+#   def create
+#       user = User.find_by_email params[:email]
+#       if user && user.authenticate(params[:password])
+#
+#         if params[:remember_me]
+#           cookies.permanent[:auth_token] = user.auth_token
+#           sign_in(user)
+#         else
+#           cookies[:auth_token] = user.auth_token
+#         end
+#         redirect_to root_path, notice: "Signed In!"
+#       else
+#         flash[:alert] = "wrong credentials"
+#         render :new
+#     end
+#   end
+#
+#   def destroy
+#     cookies.delete(:auth_token)
+#     redirect_to root_path, notice: "Signed out!"
+#   end
+#
+# end
+
+class SessionsController < ApplicationController
+  def new
+  end
+
+  def create
+    user = User.find_by_email params[:sessions][:email]
+    if user && user.authenticate(params[:sessions][:password])
+      sign_in(user)
+      redirect_to root_path, notice: "Signed In!"
+    else
+      flash[:alert] = "wrong credentials"
+      render :new
+  end
+end
+
+def destroy
+  session[:user_id] = nil
+  redirect_to root_path, notice: "Signed out!"
+end
+
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000..8b0e455
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,71 @@
+class UsersController < ApplicationController
+  before_action :set_user, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @users = User.all
+  end
+
+
+  def show
+  end
+
+  # GET /users/new
+  def new
+    @user = User.new
+  end
+
+  # GET /users/1/edit
+  def edit
+  end
+
+  # POST /users
+  # POST /users.json
+  def create
+    @user = User.new(user_params)
+
+    respond_to do |format|
+      if @user.save
+        format.html { redirect_to @user, notice: 'User was successfully created.' }
+        format.json { render :show, status: :created, location: @user }
+      else
+        format.html { render :new }
+        format.json { render json: @user.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /users/1
+  # PATCH/PUT /users/1.json
+  def update
+    respond_to do |format|
+      if @user.update(user_params)
+        format.html { redirect_to @user, notice: 'User was successfully updated.' }
+        format.json { render :show, status: :ok, location: @user }
+      else
+        format.html { render :edit }
+        format.json { render json: @user.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /users/1
+  # DELETE /users/1.json
+  def destroy
+    @user.destroy
+    respond_to do |format|
+      format.html { redirect_to users_url, notice: 'User was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_user
+      @user = User.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def user_params
+      params.require(:user).permit(:first_name, :last_name, :email, :password, :password_confirmation)
+    end
+end
diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
new file mode 100644
index 0000000..0ec9ca5
--- /dev/null
+++ b/app/helpers/comments_helper.rb
@@ -0,0 +1,2 @@
+module CommentsHelper
+end
diff --git a/app/helpers/likes_helper.rb b/app/helpers/likes_helper.rb
new file mode 100644
index 0000000..a78a759
--- /dev/null
+++ b/app/helpers/likes_helper.rb
@@ -0,0 +1,2 @@
+module LikesHelper
+end
diff --git a/app/helpers/password_resets_helper.rb b/app/helpers/password_resets_helper.rb
new file mode 100644
index 0000000..0c9d96e
--- /dev/null
+++ b/app/helpers/password_resets_helper.rb
@@ -0,0 +1,2 @@
+module PasswordResetsHelper
+end
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
new file mode 100644
index 0000000..309f8b2
--- /dev/null
+++ b/app/helpers/sessions_helper.rb
@@ -0,0 +1,2 @@
+module SessionsHelper
+end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
new file mode 100644
index 0000000..2310a24
--- /dev/null
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,2 @@
+module UsersHelper
+end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
new file mode 100644
index 0000000..4fc4605
--- /dev/null
+++ b/app/mailers/application_mailer.rb
@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: "asaroha@sfu.ca"
+  layout 'mailer'
+end
diff --git a/app/mailers/likes_mailer.rb b/app/mailers/likes_mailer.rb
new file mode 100644
index 0000000..6f7c48f
--- /dev/null
+++ b/app/mailers/likes_mailer.rb
@@ -0,0 +1,7 @@
+class LikesMailer < ApplicationMailer
+  def notify_article_owner(like)
+    @user = like.user
+    @article = like.article
+    mail(to: @article.user.email, subject: "#{@user.full_name} liked you post")
+  end
+end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
new file mode 100644
index 0000000..0a81ad8
--- /dev/null
+++ b/app/mailers/user_mailer.rb
@@ -0,0 +1,15 @@
+class UserMailer < ApplicationMailer
+  default from: "anuragemailer@gmail.com"
+
+  def welcome_email(user)
+    @user = user
+    @url = 'http://localhost:3000/'
+    mail(to: @user.email, subject: 'Welcome to My Awesome Site')
+  end
+
+  def password_reset(user)
+    @user = user
+    mail(to: @user.email, subject: 'Password Reset')
+  end
+
+end
diff --git a/app/models/ability.rb b/app/models/ability.rb
new file mode 100644
index 0000000..fbcc206
--- /dev/null
+++ b/app/models/ability.rb
@@ -0,0 +1,44 @@
+class Ability
+  include CanCan::Ability
+
+  def initialize(user)
+    user ||= User.new
+
+    # if user.admin?
+    #   can :manage, :all
+    # else
+    #   can :read, :all
+    # end
+
+    can :manage, Article do |article|
+      article.user == user
+    end
+
+    can :manage, Comment do |comment|
+      comment.user_id == user
+    end
+
+    # Define abilities for the passed in user here. For example:
+    #
+    # user ||= User.new # guest user (not logged in)
+
+    #
+    # The first argument to `can` is the action you are giving the user
+    # permission to do.
+    # If you pass :manage it will apply to every action. Other common actions
+    # here are :read, :create, :update and :destroy.
+    #
+    # The second argument is the resource the user can perform the action on.
+    # If you pass :all it will apply to every resource. Otherwise pass a Ruby
+    # class of the resource.
+    #
+    # The third argument is an optional hash of conditions to further filter the
+    # objects.
+    # For example, here the user can only update published articles.
+    #
+    #   can :update, Article, :published => true
+    #
+    # See the wiki for details:
+    # https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
+  end
+end
diff --git a/app/models/article.rb b/app/models/article.rb
index b7ac9f7..87dcb50 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -1,2 +1,42 @@
 class Article < ActiveRecord::Base
+  has_many :comments, dependent: :destroy
+  has_many :likes, dependent: :destroy
+  has_many :users, through: :likes
+  belongs_to :category
+  belongs_to :user
+  has_many :taggings, dependent: :destroy
+  has_many :tags, through: :taggings
+
+  validates :title, presence: true,
+                    length: { minimum: 5 }
+
+
+  def self.search(search)
+    if search
+      self.where("name like ?", "%#{search}%")
+    else
+      self.all
+    end
+  end
+
+    def new_first_comments
+      comments.order(created_at: :desc)
+    end
+
+    def like_for(user)
+      likes.find_by_user_id(user)
+    end
+
+    def tag_names=(names)
+      self.tags = names.split(",").map do |name|
+        Tag.where(name: name.strip).first_or_create!
+      end
+    end
+
+    def tag_names
+      self.tags.map(&:name).join(", ")
+    end
+
+    paginates_per 10
+
 end
diff --git a/app/models/category.rb b/app/models/category.rb
index 910a009..bfd80b7 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -1,2 +1,4 @@
 class Category < ActiveRecord::Base
+  has_many :articles, dependent: :nullify
+  validates :title, presence: true, uniqueness: true
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 45b2d38..b550a4e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,2 +1,4 @@
 class Comment < ActiveRecord::Base
+  belongs_to :article
+  validates :body, presence: true, uniqueness: {scope: :article_id}
 end
diff --git a/app/models/like.rb b/app/models/like.rb
new file mode 100644
index 0000000..e7d18e1
--- /dev/null
+++ b/app/models/like.rb
@@ -0,0 +1,4 @@
+class Like < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :article
+end
diff --git a/app/models/tag.rb b/app/models/tag.rb
new file mode 100644
index 0000000..ebda770
--- /dev/null
+++ b/app/models/tag.rb
@@ -0,0 +1,5 @@
+class Tag < ActiveRecord::Base
+  has_many :taggings
+  has_many :articles, through: :taggings
+
+end
diff --git a/app/models/tagging.rb b/app/models/tagging.rb
new file mode 100644
index 0000000..3df7d12
--- /dev/null
+++ b/app/models/tagging.rb
@@ -0,0 +1,4 @@
+class Tagging < ActiveRecord::Base
+  belongs_to :article
+  belongs_to :tag
+end
diff --git a/app/models/user.rb b/app/models/user.rb
new file mode 100644
index 0000000..ef7fcea
--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,36 @@
+class User < ActiveRecord::Base
+
+  has_many :likes, dependent: :destroy
+  has_secure_password
+  validates :email, presence: true, uniqueness: true, format: /\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
+  validates :last_name, presence: true
+  validates :first_name, presence: true
+  # validates :password, presence: true
+
+  before_create {generate_token(:auth_token)}
+
+  def full_name
+    "#{first_name} #{last_name}"
+  end
+
+  def self.create_from_twitter(twitter_data)
+    user = User.new
+  end
+
+  def send_password_reset
+    generate_token(:password_reset_token)
+    self.password_reset_sent_at = Time.zone.now
+    save!
+    UserMailer.password_reset(self).deliver
+  end
+
+  def generate_token(column)
+    begin
+      self[column] = SecureRandom.urlsafe_base64
+    end while User.exists?(column => self[column])
+  end
+
+
+  attr_accessor :abc
+
+end
diff --git a/app/views/articles/_article.html.erb b/app/views/articles/_article.html.erb
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/articles/_form.html.erb b/app/views/articles/_form.html.erb
new file mode 100644
index 0000000..ce6797f
--- /dev/null
+++ b/app/views/articles/_form.html.erb
@@ -0,0 +1,17 @@
+<%= simple_form_for @article do |f| %>
+  <div class="container">
+    <p>
+      <%= f.input :title %>
+    </p>
+    <p>
+      <%= f.input :text, {rows: "10", cols: "50"}%>
+    </p>
+      <%= f.input :category_id, :collection => Category.all %>
+    <div>
+      <%= f.text_field :tag_names, placeholder: "Tags separated with comma" %>
+    </div>
+    <p>
+      <%= f.submit %>
+    </p>
+  </div>
+  <% end %>
diff --git a/app/views/articles/edit.html.erb b/app/views/articles/edit.html.erb
new file mode 100644
index 0000000..7efdfbc
--- /dev/null
+++ b/app/views/articles/edit.html.erb
@@ -0,0 +1,3 @@
+<h1>Editing article</h1>
+<%= render 'form' %>
+<%= link_to 'Back', articles_path %>
diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb
index c1d8780..96a71bb 100644
--- a/app/views/articles/index.html.erb
+++ b/app/views/articles/index.html.erb
@@ -1,6 +1,46 @@
 <h1>Listing articles</h1>
-<% @articles.each do |articles| %>
-<%= articles.title %>
-<%= link_to articles.title, article_path(articles) %>
-<hr />
+<p><%= button_to "Submit a New Request", new_article_path, :method => :get %></p>
+
+<%= search_form_for @a do |f| %>
+  <%= f.label :name_cont %>
+  <%= f.search_field :title_cont %>
+  <%= f.submit %>
+
 <% end %>
+<% if @articles.present? %>
+  <%= render @articles %>
+<% else %>
+  <p>There are no requests containing the term(s) <%= params[:search] %>.</p>
+<% end %><br>
+<br>
+
+<div>
+<table width='100%' border="1">
+  <tr>
+    <th style="text-align:center">Title</th>
+    <th style="text-align:center">Text</th>
+    <% if can? :edit, @article %>
+    <th style="text-align:center">Actions</th>
+    <% end %>
+    <th style="text-align:center">Tags</th>
+  </tr>
+
+  <% @articles.each do |s| %>
+    <tr style="text-align:center">
+      <td><%= link_to s.title, article_path(s) %></td>
+      <td><%= truncate(s.text, length: 50) %></td>
+      <% if can? :edit, @article %>
+      <td><%= link_to 'Edit', edit_article_path(s) %>
+      <% end %>
+      <% if can? :destroy, @article %>
+      <%= link_to 'Delete', article_path(s),
+              method: :delete,
+              data: { confirm: 'Are you sure?' } %></td>
+      <% end %>
+      <td><%= s.tag_names %></td>
+    </tr>
+  <% end %>
+  <%= paginate @articles %>
+</table>
+</div>
+<br />
diff --git a/app/views/articles/new.html.erb b/app/views/articles/new.html.erb
index 463bc19..fd450d1 100644
--- a/app/views/articles/new.html.erb
+++ b/app/views/articles/new.html.erb
@@ -1,18 +1,3 @@
 <h1>New Article</h1>
-<%= form_for :article, url: articles_path do |f| %>
-  <p>
-    <%= f.label :title %><br>
-    <%= f.text_field :title %>
-  </p>
-
-  <p>
-    <%= f.label :text %><br>
-    <%= f.text_area :text %>
-  </p>
-
-  <p>
-    <%= f.submit %>
-  </p>
-<% end %>
-
+<%= render 'form' %>
 <%= link_to 'Back', articles_path %>
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index aeebef6..45a7707 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -1,14 +1,51 @@
-<p>
-  <strong>Title:</strong>
-  <%= @article.title %>
-</p>
-
-<p>
-  <strong>Text:</strong>
-  <%= @article.text %>
-</p>
-<%= link_to "Edit", edit_article_path(@article) %>
-<%= link_to "Delete", article_path(@article),
-                      method: :delete,
-                      data: {confirm: "Are you sure"}%>
+<div class="article-header">
+  <h1>Article</h1>
+</div>
+<div class="article-title">
+  <p>
+    <strong>Title:</strong>
+    <%= @article.title %>
+  </p>
+</div>
+<div class="article-body">
+  <p>
+    <strong>Text:</strong>
+    <%= @article.text %>
+  </p>
+</div>
+<div class="article-tags">
+  <strong>Tags: </strong>
+  <%= @article.tag_names %>
+</div>
+
+<% if @like.present? && @like.persisted? %>
+  <%= link_to "Un-Like", article_like_path(@article, @like), method: :delete %>
+<% else %>
+  <%= link_to "Like", article_likes_path(@article), method: :post %>
+<% end %>
+
+<% if can? :edit, @article %>
+  <%= link_to "Edit", edit_article_path(@article) %>
+<% end %>
+
+<% if can? :destroy, @article %>
+  <%= link_to "Delete", article_path(@article), method: :delete, data: {confirm: "Are you sure?"} %>
+<% end %>
+<h2>Make a Comment</h2>
+<%= simple_form_for [@article, @comment] do |f| %>
+  <div class="container">
+    <%= f.input :body %>
+    <br />
+    <%= f.button :submit %>
+  </div>
+<% end %>
+
+<h3>Comments</h3>
+<% @article.new_first_comments.each do |comms| %>
+  <strong>Body :</strong>
+  <%= comms.body %> <br />
+  <% if can? :destroy, comms  %>
+    <%= link_to "Delete", [@article, comms], method: :delete, data: {confirm: "Are you sure?"} %>
+  <% end %>
+<% end %>
 <%= link_to 'Back', articles_path %>
diff --git a/app/views/home/about.html.erb b/app/views/home/about.html.erb
index e9ecc5c..bc0c71b 100644
--- a/app/views/home/about.html.erb
+++ b/app/views/home/about.html.erb
@@ -3,5 +3,7 @@
 <%= link_to image_tag("http://i2.kym-cdn.com/entries/icons/original/000/001/987/fyeah.jpg", border: 1) %>
 </div>
 <p>
+  <color="grey">Angela has edited your doc! :)</color>
+  <br>
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 </p>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 3de89f5..54d412a 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -1,2 +1,2 @@
 <h1>Home Page</h1>
-<%= link_to 'My Blog', controller: 'articles' %>
+<!-- <%= link_to image_tag("http://i.imgur.com/ho1aO.gif", border: 1) %> -->
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9de8f70..e566fbb 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -7,12 +7,38 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
-<nav >
-  <%= link_to 'Home', home_index_path %>
-  <%= link_to 'My Blog', controller: 'articles' %>
-  <%= link_to 'About', about_path %>  
+<nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container">
+    <ul class="nav navbar-nav navbar-left">
+      <%= link_to 'Home', root_path %>
+      <%= link_to 'All Articles', articles_path %>
+      <%= link_to 'About', about_path %>
+    </ul>
+    <ul class="nav navbar-nav navbar-right">
+      <% if user_signed_in? %>
+        Hello, <%= current_user.first_name %>
+        <%= link_to "Sign Out", sessions_path, method: :delete %>
+        <%= link_to 'Edit', edit_user_path(current_user) %>
+      <% else %>
+        <%= link_to "Sign Up", new_user_path %>
+        <%= link_to "Sign In", new_session_path %>
+      <% end %>
+    </ul>
+  </div>
 </nav>
+  <hr />
+
+<% if flash[:notice] %>
+  <div class="flash-notice"><%= flash[:alert] %>
+  </div>
+<% elsif flash[:alert] %>
+  <div class="flash-alert" >
+    <%= flash[:alert] %>
+  </div>
+<% end %>
+
 <%= yield %>
 
+
 </body>
 </html>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
new file mode 100644
index 0000000..991cf0f
--- /dev/null
+++ b/app/views/layouts/mailer.html.erb
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
new file mode 100644
index 0000000..37f0bdd
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/app/views/likes_mailer/notify_article_ownder.text.erb b/app/views/likes_mailer/notify_article_ownder.text.erb
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/likes_mailer/notify_article_owner.html.erb b/app/views/likes_mailer/notify_article_owner.html.erb
new file mode 100644
index 0000000..053cea7
--- /dev/null
+++ b/app/views/likes_mailer/notify_article_owner.html.erb
@@ -0,0 +1,5 @@
+<p>Hello <%= @article.user.full_name %>,</p>
+<p><%= @user.full_name.capitalize %> has just liked your article titled: <%= @article.title %>.</p>
+<p>Click <%= link_to "here", article_path(@article) %> to view your article.</p>
+<p>Regards,</p>
+<p>Awesome Articles Team</p>
diff --git a/app/views/password_resets/edit.html.erb b/app/views/password_resets/edit.html.erb
new file mode 100644
index 0000000..3c02b8c
--- /dev/null
+++ b/app/views/password_resets/edit.html.erb
@@ -0,0 +1,10 @@
+<h1>Password Reset</h1>
+<%= simple_form_for @user, :url => password_reset_path(params[:id]) do |f| %>
+  <div class="field">
+    <%= f.input :password %>
+  </div>
+  <div class="field">
+    <%= f.input :password_confirmation %>
+  </div>
+  <div class="actions"><%= f.submit "Update Password" %></div>
+<% end %>
diff --git a/app/views/password_resets/new.html.erb b/app/views/password_resets/new.html.erb
new file mode 100644
index 0000000..18a51ad
--- /dev/null
+++ b/app/views/password_resets/new.html.erb
@@ -0,0 +1,11 @@
+<h1>Password Resets</h1>
+<%= form_tag password_resets_path, :method => :post do %>
+  <div class="field">
+    <%= label_tag :email %>
+    <%= email_field_tag :email, params[:email]%>
+  </div>
+  <div class="actions">
+    <%= submit_tag "Submit" %>
+  </div>
+
+<% end %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
new file mode 100644
index 0000000..a3d14ec
--- /dev/null
+++ b/app/views/sessions/new.html.erb
@@ -0,0 +1,14 @@
+<h1>Sign In</h1>
+
+<%= simple_form_for :sessions, :url => sessions_path, :html => { :class => 'form-vertical' } do |f| %>
+  <div class="container">
+    <%= f.input :email %>
+    <%= f.input :password %>
+    <p>
+      <%= f.button :submit, "Sign In" %>
+      <%= label_tag :remember_me %>
+      <%= check_box_tag :remember_me, 1, params[:remember_me]%>
+    </p>
+    <%= link_to "(forgot password)", new_password_reset_path %>
+  </div>
+<% end %>
diff --git a/app/views/user_mailer/password_reset.html.erb b/app/views/user_mailer/password_reset.html.erb
new file mode 100644
index 0000000..4a6d024
--- /dev/null
+++ b/app/views/user_mailer/password_reset.html.erb
@@ -0,0 +1,12 @@
+<h1>Password reset</h1>
+
+<p>To reset your password click the link below:</p>
+
+<%= link_to "Reset password",edit_password_reset_url(@user.password_reset_token) %>
+
+<p>This link will expire in two hours.</p>
+
+<p>
+If you did not request your password to be reset, please ignore this email and
+your password will stay as it is.
+</p>
diff --git a/app/views/user_mailer/password_reset.text.erb b/app/views/user_mailer/password_reset.text.erb
new file mode 100644
index 0000000..a7b7df0
--- /dev/null
+++ b/app/views/user_mailer/password_reset.text.erb
@@ -0,0 +1,8 @@
+To reset your password click the link below:
+
+<%= edit_password_reset_url(@user.password_reset_token) %>
+
+This link will expire in two hours.
+
+If you did not request your password to be reset, please ignore this email and
+your password will stay as it is.
diff --git a/app/views/user_mailer/welcome_email.html.erb b/app/views/user_mailer/welcome_email.html.erb
new file mode 100644
index 0000000..a62f0c8
--- /dev/null
+++ b/app/views/user_mailer/welcome_email.html.erb
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+  </head>
+  <body>
+    <h1>Welcome to example.com, <%= @user.name %></h1>
+    <p>
+      You have successfully signed up to example.com,
+      your username is: <%= @user.login %>.<br>
+    </p>
+    <p>
+      To login to the site, just follow this link: <%= @url %>.
+    </p>
+    <p>Thanks for joining and have a great day!</p>
+  </body>
+</html>
diff --git a/app/views/user_mailer/welcome_email.txt.erb b/app/views/user_mailer/welcome_email.txt.erb
new file mode 100644
index 0000000..9e16ceb
--- /dev/null
+++ b/app/views/user_mailer/welcome_email.txt.erb
@@ -0,0 +1,9 @@
+Welcome to example.com, <%= @user.name %>
+===============================================
+
+You have successfully signed up to example.com,
+your username is: <%= @user.login %>.
+
+To login to the site, just follow this link: <%= @url %>.
+
+Thanks for joining and have a great day!
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
new file mode 100644
index 0000000..7404f01
--- /dev/null
+++ b/app/views/users/_form.html.erb
@@ -0,0 +1,10 @@
+<%= simple_form_for @user do |f| %>
+  <div class="container">
+    <%= f.input :first_name %>
+    <%= f.input :last_name %>
+    <%= f.input :email %>
+    <%= f.input :password %>
+    <%= f.input :password_confirmation %>
+    <%= f.button :submit %>
+  </div>
+<% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
new file mode 100644
index 0000000..defd36f
--- /dev/null
+++ b/app/views/users/edit.html.erb
@@ -0,0 +1,6 @@
+<h1>Editing User</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @user %> |
+<%= link_to 'Back', root_path %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
new file mode 100644
index 0000000..9c35595
--- /dev/null
+++ b/app/views/users/index.html.erb
@@ -0,0 +1,31 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Listing Users</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Email</th>
+      <th>Action</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @users.each do |user| %>
+      <tr>
+        <td><%= user.first_name %></td>
+        <td><%= user.last_name %></td>
+        <td><%= user.email %></td>
+        <td><%= link_to 'Show', user %></td>
+        <td><%= link_to 'Edit', edit_user_path(user) %></td>
+        <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New User', new_user_path %>
diff --git a/app/views/users/index.json.jbuilder b/app/views/users/index.json.jbuilder
new file mode 100644
index 0000000..3e86d7e
--- /dev/null
+++ b/app/views/users/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.array!(@users) do |user|
+  json.extract! user, :id, :name, :email, :login
+  json.url user_url(user, format: :json)
+end
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
new file mode 100644
index 0000000..923db7b
--- /dev/null
+++ b/app/views/users/new.html.erb
@@ -0,0 +1,2 @@
+<h1>Create an Account</h1>
+<%= render 'form' %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
new file mode 100644
index 0000000..a3e95dc
--- /dev/null
+++ b/app/views/users/show.html.erb
@@ -0,0 +1,16 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Name:</strong>
+  <%= @user.first_name %>
+  <%= @user.last_name %>
+</p>
+
+<p>
+  <strong>Email:</strong>
+  <%= @user.email %>
+</p>
+
+
+<%= link_to 'Edit', edit_user_path(@user) %> |
+<%= link_to 'Back', root_path %>
diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder
new file mode 100644
index 0000000..1b2b1ef
--- /dev/null
+++ b/app/views/users/show.json.jbuilder
@@ -0,0 +1 @@
+json.extract! @user, :id, :name, :email, :login, :created_at, :updated_at
diff --git a/config/database.yml b/config/database.yml
index fda8e23..bfaeb2d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -80,6 +80,8 @@ test:
 #
 production:
   <<: *default
-  database: blog_production
-  username: blog
-  password: <%= ENV['BLOG_DATABASE_PASSWORD'] %>
+  url: <%= ENV['DATABASE_URL'] %>
+  host:  <%= ENV['DATABASE_HOST'] %>
+  database: <%= ENV['DATABASE_NAME'] %>
+  username: <%= ENV['DATABASE_USERNAME'] %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index b55e214..e9d6c7b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -14,7 +14,7 @@
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
@@ -36,6 +36,7 @@
   # Raises helpful error messages.
   config.assets.raise_runtime_errors = true
 
+  config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb
new file mode 100644
index 0000000..b1d87b0
--- /dev/null
+++ b/config/initializers/kaminari_config.rb
@@ -0,0 +1,10 @@
+Kaminari.configure do |config|
+  # config.default_per_page = 25
+  # config.max_per_page = nil
+  # config.window = 4
+  # config.outer_window = 0
+  # config.left = 0
+  # config.right = 0
+  # config.page_method_name = :page
+  # config.param_name = :page
+end
diff --git a/config/initializers/setup_mail.rb b/config/initializers/setup_mail.rb
new file mode 100644
index 0000000..0a8699f
--- /dev/null
+++ b/config/initializers/setup_mail.rb
@@ -0,0 +1,9 @@
+ActionMailer::Base.smtp_settings = {
+  address: "smtp.gmail.com",
+  port: "587",
+  enable_starttls_auto: true,
+  authentication: :plain,
+  user_name: ENV["email_user_name"],
+  password: ENV["email_password"]
+
+}
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
new file mode 100644
index 0000000..934487a
--- /dev/null
+++ b/config/initializers/simple_form.rb
@@ -0,0 +1,165 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  # Wrappers are used by the form builder to generate a
+  # complete input. You can remove any component from the
+  # wrapper, change the order or even add your own to the
+  # stack. The options given below are used to wrap the
+  # whole input.
+  config.wrappers :default, class: :input,
+    hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+    ## Extensions enabled by default
+    # Any of these extensions can be disabled for a
+    # given input by passing: `f.input EXTENSION_NAME => false`.
+    # You can make any of these extensions optional by
+    # renaming `b.use` to `b.optional`.
+
+    # Determines whether to use HTML5 (:email, :url, ...)
+    # and required attributes
+    b.use :html5
+
+    # Calculates placeholders automatically from I18n
+    # You can also pass a string as f.input placeholder: "Placeholder"
+    b.use :placeholder
+
+    ## Optional extensions
+    # They are disabled unless you pass `f.input EXTENSION_NAME => true`
+    # to the input. If so, they will retrieve the values from the model
+    # if any exists. If you want to enable any of those
+    # extensions by default, you can change `b.optional` to `b.use`.
+
+    # Calculates maxlength from length validations for string inputs
+    b.optional :maxlength
+
+    # Calculates pattern from format validations for string inputs
+    b.optional :pattern
+
+    # Calculates min and max from length validations for numeric inputs
+    b.optional :min_max
+
+    # Calculates readonly automatically from readonly attributes
+    b.optional :readonly
+
+    ## Inputs
+    b.use :label_input
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
+
+    ## full_messages_for
+    # If you want to display the full error message for the attribute, you can
+    # use the component :full_error, like:
+    #
+    # b.use :full_error, wrap_with: { tag: :span, class: :error }
+  end
+
+  # The default wrapper to be used by the FormBuilder.
+  config.default_wrapper = :default
+
+  # Define the way to render check boxes / radio buttons with labels.
+  # Defaults to :nested for bootstrap config.
+  #   inline: input + label
+  #   nested: label > input
+  config.boolean_style = :nested
+
+  # Default class for buttons
+  config.button_class = 'btn'
+
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # Use :to_sentence to list all errors for each field.
+  # config.error_method = :first
+
+  # Default tag used for error notification helper.
+  config.error_notification_tag = :div
+
+  # CSS class to add for error notification helper.
+  config.error_notification_class = 'error_notification'
+
+  # ID to add for error notification helper.
+  # config.error_notification_id = nil
+
+  # Series of attempts to detect a default label method for collection.
+  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
+
+  # Series of attempts to detect a default value method for collection.
+  # config.collection_value_methods = [ :id, :to_s ]
+
+  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+  # config.collection_wrapper_tag = nil
+
+  # You can define the class to use on all collection wrappers. Defaulting to none.
+  # config.collection_wrapper_class = nil
+
+  # You can wrap each item in a collection of radio/check boxes with a tag,
+  # defaulting to :span.
+  # config.item_wrapper_tag = :span
+
+  # You can define a class to use in all item wrappers. Defaulting to none.
+  # config.item_wrapper_class = nil
+
+  # How the label text should be generated altogether with the required text.
+  # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
+
+  # You can define the class to use on all labels. Default is nil.
+  # config.label_class = nil
+
+  # You can define the default class to be used on forms. Can be overriden
+  # with `html: { :class }`. Defaulting to none.
+  # config.default_form_class = nil
+
+  # You can define which elements should obtain additional classes
+  # config.generate_additional_classes_for = [:wrapper, :label, :input]
+
+  # Whether attributes are required by default (or not). Default is true.
+  # config.required_by_default = true
+
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
+  config.browser_validations = false
+
+  # Collection of methods to detect if a file type was given.
+  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
+
+  # Custom mappings for input types. This should be a hash containing a regexp
+  # to match as key, and the input type that will be used when the field name
+  # matches the regexp as value.
+  # config.input_mappings = { /count/ => :integer }
+
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # config.wrapper_mappings = { string: :prepend }
+
+  # Namespaces where SimpleForm should look for custom input classes that
+  # override default inputs.
+  # config.custom_inputs_namespaces << "CustomInputs"
+
+  # Default priority for time_zone inputs.
+  # config.time_zone_priority = nil
+
+  # Default priority for country inputs.
+  # config.country_priority = nil
+
+  # When false, do not use translations for labels.
+  # config.translate_labels = true
+
+  # Automatically discover new inputs in Rails' autoload path.
+  # config.inputs_discovery = true
+
+  # Cache SimpleForm inputs discovery
+  # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
+
+  # Define the default class of the input wrapper of the boolean input.
+  config.boolean_label_class = 'checkbox'
+
+  # Defines if the default input wrapper class should be included in radio
+  # collection wrappers.
+  # config.include_default_input_wrapper_class = true
+
+  # Defines which i18n scope will be used in Simple Form.
+  # config.i18n_scope = 'simple_form'
+end
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
new file mode 100644
index 0000000..109d29a
--- /dev/null
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -0,0 +1,149 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  config.error_notification_class = 'alert alert-danger'
+  config.button_class = 'btn btn-default'
+  config.boolean_label_class = nil
+
+  config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+
+    b.use :input, class: 'form-control'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+
+    b.use :input
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'checkbox' do |ba|
+      ba.use :label_input
+    end
+
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+    b.use :input
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :horizontal_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input, class: 'form-control'
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'col-sm-offset-3 col-sm-9' do |wr|
+      wr.wrapper tag: 'div', class: 'checkbox' do |ba|
+        ba.use :label_input
+      end
+
+      wr.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      wr.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :inline_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'sr-only'
+
+    b.use :input, class: 'form-control'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :multi_select, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+    b.wrapper tag: 'div', class: 'form-inline' do |ba|
+      ba.use :input, class: 'form-control'
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+  # Wrappers for forms and inputs using the Bootstrap toolkit.
+  # Check the Bootstrap docs (http://getbootstrap.com)
+  # to learn about the different styles for forms and inputs,
+  # buttons and other elements.
+  config.default_wrapper = :vertical_form
+  config.wrapper_mappings = {
+    check_boxes: :vertical_radio_and_checkboxes,
+    radio_buttons: :vertical_radio_and_checkboxes,
+    file: :vertical_file_input,
+    boolean: :vertical_boolean,
+    datetime: :multi_select,
+    date: :multi_select,
+    time: :multi_select
+  }
+end
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
new file mode 100644
index 0000000..2374383
--- /dev/null
+++ b/config/locales/simple_form.en.yml
@@ -0,0 +1,31 @@
+en:
+  simple_form:
+    "yes": 'Yes'
+    "no": 'No'
+    required:
+      text: 'required'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "Please review the problems below:"
+    # Examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'
+    # include_blanks:
+    #   defaults:
+    #     age: 'Rather not say'
+    # prompts:
+    #   defaults:
+    #     age: 'Select your age'
diff --git a/config/routes.rb b/config/routes.rb
index 81240d8..109cc2b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,9 @@
 Rails.application.routes.draw do
+  resources :users
+  get 'password_resets/new'
+
+  get 'password_resets/edit'
+
   get 'home/index'
 
   # The priority is based upon order of creation: first created -> highest priority.
@@ -7,7 +12,17 @@
   # You can have the root of your site routed with "root"
   root 'home#index'
 
-  resources :articles
+  resources :users, only: [:new, :create, :edit, :update, :show]
+
+  resources :sessions, only: [:new, :create] do
+    delete :destroy, on: :collection
+  end
+  resources :articles do
+    resources :comments, only: [:create, :destroy]
+    resources :likes, only: [:create, :destroy]
+  end
+
+  resources :password_resets, only: [:new, :create, :edit, :update]
 
   get "/about" => "home#about"
   # Example of regular route:
diff --git a/db/migrate/20160616015334_add_category_references_to_article.rb b/db/migrate/20160616015334_add_category_references_to_article.rb
new file mode 100644
index 0000000..a035d04
--- /dev/null
+++ b/db/migrate/20160616015334_add_category_references_to_article.rb
@@ -0,0 +1,5 @@
+class AddCategoryReferencesToArticle < ActiveRecord::Migration
+  def change
+    add_reference :articles, :category, index: true, foreign_key: true
+  end
+end
diff --git a/db/migrate/20160616023916_create_users.rb b/db/migrate/20160616023916_create_users.rb
new file mode 100644
index 0000000..2905b16
--- /dev/null
+++ b/db/migrate/20160616023916_create_users.rb
@@ -0,0 +1,13 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :first_name
+      t.string :last_name
+      t.string :email
+      t.string :password_digest
+
+      t.timestamps null: false
+    end
+  add_index :users, :email, unique: true
+  end
+end
diff --git a/db/migrate/20160623034943_add_reset_to_users.rb b/db/migrate/20160623034943_add_reset_to_users.rb
new file mode 100644
index 0000000..9967dc8
--- /dev/null
+++ b/db/migrate/20160623034943_add_reset_to_users.rb
@@ -0,0 +1,5 @@
+class AddResetToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :reset_digest, :string
+  end
+end
diff --git a/db/migrate/20160612043758_create_comments.rb b/db/migrate/20160713003620_create_comments.rb
similarity index 58%
rename from db/migrate/20160612043758_create_comments.rb
rename to db/migrate/20160713003620_create_comments.rb
index bb50905..24d187e 100644
--- a/db/migrate/20160612043758_create_comments.rb
+++ b/db/migrate/20160713003620_create_comments.rb
@@ -2,6 +2,8 @@ class CreateComments < ActiveRecord::Migration
   def change
     create_table :comments do |t|
       t.text :body
+      t.references :article, index: true, foreign_key: true
+      t.references :user, index: true, foreign_key: true
 
       t.timestamps null: false
     end
diff --git a/db/migrate/20160714010030_create_likes.rb b/db/migrate/20160714010030_create_likes.rb
new file mode 100644
index 0000000..1c39c05
--- /dev/null
+++ b/db/migrate/20160714010030_create_likes.rb
@@ -0,0 +1,10 @@
+class CreateLikes < ActiveRecord::Migration
+  def change
+    create_table :likes do |t|
+      t.references :user, index: true, foreign_key: true
+      t.references :article, index: true, foreign_key: true
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20160714032305_add_user_id_to_articles.rb b/db/migrate/20160714032305_add_user_id_to_articles.rb
new file mode 100644
index 0000000..c27851b
--- /dev/null
+++ b/db/migrate/20160714032305_add_user_id_to_articles.rb
@@ -0,0 +1,5 @@
+class AddUserIdToArticles < ActiveRecord::Migration
+  def change
+    add_column :articles, :user_id, :integer
+  end
+end
diff --git a/db/migrate/20160715002825_add_auth_token_to_users.rb b/db/migrate/20160715002825_add_auth_token_to_users.rb
new file mode 100644
index 0000000..2c83ac1
--- /dev/null
+++ b/db/migrate/20160715002825_add_auth_token_to_users.rb
@@ -0,0 +1,5 @@
+class AddAuthTokenToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :auth_token, :string
+  end
+end
diff --git a/db/migrate/20160715012448_add_password_reset_to_users.rb b/db/migrate/20160715012448_add_password_reset_to_users.rb
new file mode 100644
index 0000000..9c93c98
--- /dev/null
+++ b/db/migrate/20160715012448_add_password_reset_to_users.rb
@@ -0,0 +1,6 @@
+class AddPasswordResetToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :password_reset_token, :string
+    add_column :users, :password_reset_sent_at, :datetime
+  end
+end
diff --git a/db/migrate/20160716010210_create_tags.rb b/db/migrate/20160716010210_create_tags.rb
new file mode 100644
index 0000000..2c708a3
--- /dev/null
+++ b/db/migrate/20160716010210_create_tags.rb
@@ -0,0 +1,9 @@
+class CreateTags < ActiveRecord::Migration
+  def change
+    create_table :tags do |t|
+      t.string :name
+      t.timestamps null: false
+    end
+    add_index :tags, :name, unique: false
+  end
+end
diff --git a/db/migrate/20160716010305_create_taggings.rb b/db/migrate/20160716010305_create_taggings.rb
new file mode 100644
index 0000000..fa2fe7a
--- /dev/null
+++ b/db/migrate/20160716010305_create_taggings.rb
@@ -0,0 +1,10 @@
+class CreateTaggings < ActiveRecord::Migration
+  def change
+    create_table :taggings do |t|
+      t.belongs_to :article, index: true, foreign_key: true
+      t.belongs_to :tag, index: true, foreign_key: true
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7cfbe54..fce898c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160612043900) do
+ActiveRecord::Schema.define(version: 20160716010305) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -19,10 +19,14 @@
   create_table "articles", force: :cascade do |t|
     t.string   "title"
     t.text     "text"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+    t.integer  "category_id"
+    t.integer  "user_id"
   end
 
+  add_index "articles", ["category_id"], name: "index_articles_on_category_id", using: :btree
+
   create_table "categories", force: :cascade do |t|
     t.string   "title"
     t.datetime "created_at", null: false
@@ -31,10 +35,15 @@
 
   create_table "comments", force: :cascade do |t|
     t.text     "body"
+    t.integer  "article_id"
+    t.integer  "user_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
+  add_index "comments", ["article_id"], name: "index_comments_on_article_id", using: :btree
+  add_index "comments", ["user_id"], name: "index_comments_on_user_id", using: :btree
+
   create_table "contacts", force: :cascade do |t|
     t.string   "email"
     t.string   "name"
@@ -44,12 +53,54 @@
     t.datetime "updated_at", null: false
   end
 
+  create_table "likes", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "article_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "likes", ["article_id"], name: "index_likes_on_article_id", using: :btree
+  add_index "likes", ["user_id"], name: "index_likes_on_user_id", using: :btree
+
+  create_table "taggings", force: :cascade do |t|
+    t.integer  "article_id"
+    t.integer  "tag_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "taggings", ["article_id"], name: "index_taggings_on_article_id", using: :btree
+  add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id", using: :btree
+
+  create_table "tags", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "tags", ["name"], name: "index_tags_on_name", using: :btree
+
   create_table "users", force: :cascade do |t|
     t.string   "first_name"
     t.string   "last_name"
     t.string   "email"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.string   "password_digest"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
+    t.string   "reset_digest"
+    t.string   "auth_token"
+    t.string   "password_reset_token"
+    t.datetime "password_reset_sent_at"
   end
 
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+
+  add_foreign_key "articles", "categories"
+  add_foreign_key "comments", "articles"
+  add_foreign_key "comments", "users"
+  add_foreign_key "likes", "articles"
+  add_foreign_key "likes", "users"
+  add_foreign_key "taggings", "articles"
+  add_foreign_key "taggings", "tags"
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index 4edb1e8..3c3102a 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,3 +5,15 @@
 #
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
+if Category.count == 0
+  ["Controversial Posts", "Infographics", "Podcast Show Notes", "Videos", "Interviews", "Guest Posts", "Blog Series"].each do |cat|
+    Category.create title: cat
+  end
+end
+
+
+50.times do
+  Article.create title: Faker::Book.title,
+                 text: Faker::Lorem.sentences,
+                 user_id: Faker::Number.between(1, 3)
+end
diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb
new file mode 100644
index 0000000..201a069
--- /dev/null
+++ b/lib/templates/erb/scaffold/_form.html.erb
@@ -0,0 +1,13 @@
+<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
+  <%%= f.error_notification %>
+
+  <div class="form-inputs">
+  <%- attributes.each do |attribute| -%>
+    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
+  <%- end -%>
+  </div>
+
+  <div class="form-actions">
+    <%%= f.button :submit %>
+  </div>
+<%% end %>
diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb
new file mode 100644
index 0000000..6c4e73d
--- /dev/null
+++ b/spec/controllers/likes_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe LikesController, type: :controller do
+
+end
diff --git a/spec/controllers/password_resets_controller_spec.rb b/spec/controllers/password_resets_controller_spec.rb
new file mode 100644
index 0000000..4f7ca1b
--- /dev/null
+++ b/spec/controllers/password_resets_controller_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe PasswordResetsController do
+
+  describe "GET 'new'" do
+    it "returns http success" do
+      get 'new'
+      response.should be_success
+    end
+  end
+
+  describe "GET 'edit'" do
+    it "returns http success" do
+      get 'edit'
+      response.should be_success
+    end
+  end
+
+end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
new file mode 100644
index 0000000..ecb1a81
--- /dev/null
+++ b/spec/controllers/users_controller_spec.rb
@@ -0,0 +1,159 @@
+require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+RSpec.describe UsersController, type: :controller do
+
+  # This should return the minimal set of attributes required to create a valid
+  # User. As you add validations to User, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) {
+    skip("Add a hash of attributes valid for your model")
+  }
+
+  let(:invalid_attributes) {
+    skip("Add a hash of attributes invalid for your model")
+  }
+
+  # This should return the minimal set of values that should be in the session
+  # in order to pass any filters (e.g. authentication) defined in
+  # UsersController. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+  describe "GET #index" do
+    it "assigns all users as @users" do
+      user = User.create! valid_attributes
+      get :index, {}, valid_session
+      expect(assigns(:users)).to eq([user])
+    end
+  end
+
+  describe "GET #show" do
+    it "assigns the requested user as @user" do
+      user = User.create! valid_attributes
+      get :show, {:id => user.to_param}, valid_session
+      expect(assigns(:user)).to eq(user)
+    end
+  end
+
+  describe "GET #new" do
+    it "assigns a new user as @user" do
+      get :new, {}, valid_session
+      expect(assigns(:user)).to be_a_new(User)
+    end
+  end
+
+  describe "GET #edit" do
+    it "assigns the requested user as @user" do
+      user = User.create! valid_attributes
+      get :edit, {:id => user.to_param}, valid_session
+      expect(assigns(:user)).to eq(user)
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      it "creates a new User" do
+        expect {
+          post :create, {:user => valid_attributes}, valid_session
+        }.to change(User, :count).by(1)
+      end
+
+      it "assigns a newly created user as @user" do
+        post :create, {:user => valid_attributes}, valid_session
+        expect(assigns(:user)).to be_a(User)
+        expect(assigns(:user)).to be_persisted
+      end
+
+      it "redirects to the created user" do
+        post :create, {:user => valid_attributes}, valid_session
+        expect(response).to redirect_to(User.last)
+      end
+    end
+
+    context "with invalid params" do
+      it "assigns a newly created but unsaved user as @user" do
+        post :create, {:user => invalid_attributes}, valid_session
+        expect(assigns(:user)).to be_a_new(User)
+      end
+
+      it "re-renders the 'new' template" do
+        post :create, {:user => invalid_attributes}, valid_session
+        expect(response).to render_template("new")
+      end
+    end
+  end
+
+  describe "PUT #update" do
+    context "with valid params" do
+      let(:new_attributes) {
+        skip("Add a hash of attributes valid for your model")
+      }
+
+      it "updates the requested user" do
+        user = User.create! valid_attributes
+        put :update, {:id => user.to_param, :user => new_attributes}, valid_session
+        user.reload
+        skip("Add assertions for updated state")
+      end
+
+      it "assigns the requested user as @user" do
+        user = User.create! valid_attributes
+        put :update, {:id => user.to_param, :user => valid_attributes}, valid_session
+        expect(assigns(:user)).to eq(user)
+      end
+
+      it "redirects to the user" do
+        user = User.create! valid_attributes
+        put :update, {:id => user.to_param, :user => valid_attributes}, valid_session
+        expect(response).to redirect_to(user)
+      end
+    end
+
+    context "with invalid params" do
+      it "assigns the user as @user" do
+        user = User.create! valid_attributes
+        put :update, {:id => user.to_param, :user => invalid_attributes}, valid_session
+        expect(assigns(:user)).to eq(user)
+      end
+
+      it "re-renders the 'edit' template" do
+        user = User.create! valid_attributes
+        put :update, {:id => user.to_param, :user => invalid_attributes}, valid_session
+        expect(response).to render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+    it "destroys the requested user" do
+      user = User.create! valid_attributes
+      expect {
+        delete :destroy, {:id => user.to_param}, valid_session
+      }.to change(User, :count).by(-1)
+    end
+
+    it "redirects to the users list" do
+      user = User.create! valid_attributes
+      delete :destroy, {:id => user.to_param}, valid_session
+      expect(response).to redirect_to(users_url)
+    end
+  end
+
+end
diff --git a/spec/helpers/likes_helper_spec.rb b/spec/helpers/likes_helper_spec.rb
new file mode 100644
index 0000000..bc19687
--- /dev/null
+++ b/spec/helpers/likes_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the LikesHelper. For example:
+#
+# describe LikesHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe LikesHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/helpers/password_resets_helper_spec.rb b/spec/helpers/password_resets_helper_spec.rb
new file mode 100644
index 0000000..02d5bab
--- /dev/null
+++ b/spec/helpers/password_resets_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the PasswordResetsHelper. For example:
+#
+# describe PasswordResetsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       helper.concat_strings("this","that").should == "this that"
+#     end
+#   end
+# end
+describe PasswordResetsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
new file mode 100644
index 0000000..b2e3444
--- /dev/null
+++ b/spec/helpers/users_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the UsersHelper. For example:
+#
+# describe UsersHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe UsersHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/mailers/likes_mailer_spec.rb b/spec/mailers/likes_mailer_spec.rb
new file mode 100644
index 0000000..68be830
--- /dev/null
+++ b/spec/mailers/likes_mailer_spec.rb
@@ -0,0 +1,5 @@
+require "rails_helper"
+
+RSpec.describe LikesMailer, type: :mailer do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/mailers/previews/likes_mailer_preview.rb b/spec/mailers/previews/likes_mailer_preview.rb
new file mode 100644
index 0000000..43797b7
--- /dev/null
+++ b/spec/mailers/previews/likes_mailer_preview.rb
@@ -0,0 +1,4 @@
+# Preview all emails at http://localhost:3000/rails/mailers/likes_mailer
+class LikesMailerPreview < ActionMailer::Preview
+
+end
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
new file mode 100644
index 0000000..957e12b
--- /dev/null
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -0,0 +1,4 @@
+# Preview all emails at http://localhost:3000/rails/mailers/user_mailer
+class UserMailerPreview < ActionMailer::Preview
+
+end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
new file mode 100644
index 0000000..4a78b85
--- /dev/null
+++ b/spec/mailers/user_mailer_spec.rb
@@ -0,0 +1,5 @@
+require "rails_helper"
+
+RSpec.describe UserMailer, type: :mailer do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb
new file mode 100644
index 0000000..76ea93d
--- /dev/null
+++ b/spec/models/like_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Like, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
new file mode 100644
index 0000000..0d0fcb0
--- /dev/null
+++ b/spec/models/tag_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Tag, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/tagging_spec.rb b/spec/models/tagging_spec.rb
new file mode 100644
index 0000000..2c5ab85
--- /dev/null
+++ b/spec/models/tagging_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Tagging, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
new file mode 100644
index 0000000..47a31bb
--- /dev/null
+++ b/spec/models/user_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe User, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/requests/users_spec.rb b/spec/requests/users_spec.rb
new file mode 100644
index 0000000..8d6a01c
--- /dev/null
+++ b/spec/requests/users_spec.rb
@@ -0,0 +1,10 @@
+require 'rails_helper'
+
+RSpec.describe "Users", type: :request do
+  describe "GET /users" do
+    it "works! (now write some real specs)" do
+      get users_path
+      expect(response).to have_http_status(200)
+    end
+  end
+end
diff --git a/spec/routing/users_routing_spec.rb b/spec/routing/users_routing_spec.rb
new file mode 100644
index 0000000..f6794fe
--- /dev/null
+++ b/spec/routing/users_routing_spec.rb
@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.describe UsersController, type: :routing do
+  describe "routing" do
+
+    it "routes to #index" do
+      expect(:get => "/users").to route_to("users#index")
+    end
+
+    it "routes to #new" do
+      expect(:get => "/users/new").to route_to("users#new")
+    end
+
+    it "routes to #show" do
+      expect(:get => "/users/1").to route_to("users#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      expect(:get => "/users/1/edit").to route_to("users#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      expect(:post => "/users").to route_to("users#create")
+    end
+
+    it "routes to #update via PUT" do
+      expect(:put => "/users/1").to route_to("users#update", :id => "1")
+    end
+
+    it "routes to #update via PATCH" do
+      expect(:patch => "/users/1").to route_to("users#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      expect(:delete => "/users/1").to route_to("users#destroy", :id => "1")
+    end
+
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 0000000..943bc19
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,42 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'rspec/autorun'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
+
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = "random"
+end
diff --git a/spec/views/password_resets/edit.html.erb_spec.rb b/spec/views/password_resets/edit.html.erb_spec.rb
new file mode 100644
index 0000000..41026a2
--- /dev/null
+++ b/spec/views/password_resets/edit.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "password_resets/edit.html.erb" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/password_resets/new.html.erb_spec.rb b/spec/views/password_resets/new.html.erb_spec.rb
new file mode 100644
index 0000000..38c6853
--- /dev/null
+++ b/spec/views/password_resets/new.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe "password_resets/new.html.erb" do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/users/edit.html.erb_spec.rb b/spec/views/users/edit.html.erb_spec.rb
new file mode 100644
index 0000000..fa03cf7
--- /dev/null
+++ b/spec/views/users/edit.html.erb_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe "users/edit", type: :view do
+  before(:each) do
+    @user = assign(:user, User.create!(
+      :name => "MyString",
+      :email => "MyString",
+      :login => "MyString"
+    ))
+  end
+
+  it "renders the edit user form" do
+    render
+
+    assert_select "form[action=?][method=?]", user_path(@user), "post" do
+
+      assert_select "input#user_name[name=?]", "user[name]"
+
+      assert_select "input#user_email[name=?]", "user[email]"
+
+      assert_select "input#user_login[name=?]", "user[login]"
+    end
+  end
+end
diff --git a/spec/views/users/index.html.erb_spec.rb b/spec/views/users/index.html.erb_spec.rb
new file mode 100644
index 0000000..3e0851d
--- /dev/null
+++ b/spec/views/users/index.html.erb_spec.rb
@@ -0,0 +1,25 @@
+require 'rails_helper'
+
+RSpec.describe "users/index", type: :view do
+  before(:each) do
+    assign(:users, [
+      User.create!(
+        :name => "Name",
+        :email => "Email",
+        :login => "Login"
+      ),
+      User.create!(
+        :name => "Name",
+        :email => "Email",
+        :login => "Login"
+      )
+    ])
+  end
+
+  it "renders a list of users" do
+    render
+    assert_select "tr>td", :text => "Name".to_s, :count => 2
+    assert_select "tr>td", :text => "Email".to_s, :count => 2
+    assert_select "tr>td", :text => "Login".to_s, :count => 2
+  end
+end
diff --git a/spec/views/users/new.html.erb_spec.rb b/spec/views/users/new.html.erb_spec.rb
new file mode 100644
index 0000000..09b9b80
--- /dev/null
+++ b/spec/views/users/new.html.erb_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe "users/new", type: :view do
+  before(:each) do
+    assign(:user, User.new(
+      :name => "MyString",
+      :email => "MyString",
+      :login => "MyString"
+    ))
+  end
+
+  it "renders new user form" do
+    render
+
+    assert_select "form[action=?][method=?]", users_path, "post" do
+
+      assert_select "input#user_name[name=?]", "user[name]"
+
+      assert_select "input#user_email[name=?]", "user[email]"
+
+      assert_select "input#user_login[name=?]", "user[login]"
+    end
+  end
+end
diff --git a/spec/views/users/show.html.erb_spec.rb b/spec/views/users/show.html.erb_spec.rb
new file mode 100644
index 0000000..de008a4
--- /dev/null
+++ b/spec/views/users/show.html.erb_spec.rb
@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+RSpec.describe "users/show", type: :view do
+  before(:each) do
+    @user = assign(:user, User.create!(
+      :name => "Name",
+      :email => "Email",
+      :login => "Login"
+    ))
+  end
+
+  it "renders attributes in <p>" do
+    render
+    expect(rendered).to match(/Name/)
+    expect(rendered).to match(/Email/)
+    expect(rendered).to match(/Login/)
+  end
+end