moved comment code from index to show
Merge pull request #31 from indotek68/master

moved comment code from index to show
clearing unneeded application.html.erb code
adds Users, and Posts to seed file work with
Merge branch 'master' into work

merging in anggas post correction
Merge pull request #32 from lisavogtsf/lisa

Add Users and Posts in seed file to work with
committing merged files from upstream master
add seeds
fix merge conflict
comment out email validations for seeding purposes
Merge pull request #33 from marklc44/master

disabled user email validation so that db:seed works
Merge branch 'master' of github.com:lisavogtsf/awesome_blog

upstream merge