add generated comments model
add CommentsController and code to render a new comment form
only show add comment link if logged in

add post_id/type to new comment link

add new_post_comment_url helper to dry params
Merge branch 'master' into comments

Conflicts:
	Gemfile
upgrade rails
Fix for breaking change in Rails point release.

rails/rails#16058

At least we haven't really deployed QA anywhere so changing URLs at whim is
currently painless.
Fix intermittent* MultipleIncludedBlock errors.

*before 4.1.1 -> 4.1.4 upgrade it was every time my code errored. With
4.1.4 it was every request.
update gems
Add pagination on answers
Add moderator flag to users
Staff should be able to edit all posts on the site
Extract PostPolicy from Answer/QuestionPolicy, since they are very similar
Merge branch 'staff-pundit'
Allow users to edit their own posts
Add test for votes#destroy behaviour
Votes will be locked after inactivity on posts
update todo list
Merge branch 'master' into comments

Conflicts:
	app/models/user.rb
	db/schema.rb
Fix guard-rspec by specifying the command
bump bootstrap-sass