Recursive comments work
Broke recursive comments again
add forgot password link on login page
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
add save to set_password_reset
Merge pull request #115 from indotek68/master

save ! in password model
Got comments working again
Merge branch 'master' of github.com:lisavogtsf/awesome_blog

Conflicts:
	app/views/shared/_comment_form.html.erb
Merge pull request #117 from MooreJesseB/master

Comments work.  Adding comments on comments doesn't.
fix seeds
fix conflict in passwordsController
Merge pull request #118 from indotek68/master

added handle bars gems and handlebars in application.js
fix password reset with del
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
Merge pull request #119 from marklc44/master

fix password reset with del
Comments on comments aren't possible
Merge conflicts
Fixed route conflict
Merge pull request #121 from MooreJesseB/master

Fixed route conflict.
Merge pull request #122 from indotek68/master

semi ajax post posts to post new