clearing unneeded application.html.erb code
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