Merge branch 'master' of github.com:lisavogtsf/awesome_blog into jesse

recursive merge
Merge branch 'master' of github.com:lisavogtsf/awesome_blog into jesse

merge conflicts
Renamed form partials and corresponding links
Merge pull request #36 from MooreJesseB/master

rename form partials