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 #117 from MooreJesseB/master

Comments work.  Adding comments on comments doesn't.
added handle bars gems and handlebars in application.js
fix seeds
fix conflict in passwordsController
added template folders
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