added a username field to devise, tweaked layout
Added more seed data.
Merge branch 'master' of heroku.com:warm-peak-7080

Conflicts:
	app/views/layouts/application.html.erb
fixed migration for devise username
Merge branch 'master' of heroku.com:warm-peak-7080
Added more seed data
Merge branch 'master' of heroku.com:warm-peak-7080
Added more seed data