routs in post index
resolved merge conflicts
touch ups here and there
merge conflict resolve
Merge branch 'master' of github.com:lisavogtsf/awesome_blog into jesse

merge upstream master with origin branch
show page fixes
styling for comments and added icon
Merge branch 'jesse'

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

merging upstream master with local repo
Merge pull request #56 from marklc44/master

home page hero and links
Merge pull request #57 from MooreJesseB/master

Filling out methods in post and comment controllers
got rid of seed file
resolve merge issue
Merge pull request #58 from indotek68/master

"Show page styling and icon"
Revert ""Show page styling and icon""
merge test
Merge pull request #59 from lisavogtsf/revert-58-master

Revert ""Show page styling and icon""
Merge pull request #60 from MooreJesseB/master

merge test
seeds are back
Merge pull request #61 from indotek68/master

seeds are back