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

merge upstream master with origin branch
Merge branch 'jesse'

merge local
Merge branch 'master' of github.com:lisavogtsf/awesome_blog

merging upstream master with local repo
Merge pull request #57 from MooreJesseB/master

Filling out methods in post and comment controllers