clearing unneeded application.html.erb code
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
Post edit new with partial.  Comment controller work in progress
Add validates to comment model
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
splash page half
Merge pull request #34 from Rakulon/master

splash page halfway there
Merge pull request #35 from MooreJesseB/master

New partial for Posts and validates for Comment model
adds posts to seed file
comments out some new seed posts