revert comments controller
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
Update README.md
Merge pull request #70 from MooreJesseB/master

Added Jesse's gist to readme
Update README.md
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
added img, and delete link to comments in post show
merge conflict sort
Update README.md
removed gist from readme
remove gist
resolve merge issue
resolve merge issues
Merge pull request #71 from indotek68/master

Img resize and delete button
works on user edit/update action
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog

merging with pull request 71
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
user auth migration and user model update
Merge pull request #72 from lisavogtsf/lisa

small changes to user controller update action