add welcom page
add welcome page
 add pages controller and add form to welcome page
add form to welcome page
create action in users controller works
add optional view
standardized user class definition
add session nickname to welcome form
remove index.html
heroku rough draft
remove binding.pry
remove binding.pry
add routing
Merge branch 'master' into home_optional_views
seeded db and cleaned up multiple pry bindings
Merge branch 'master' of github.com:omahacodeschool/twitter-diversity-report

Conflicts:
	app/models/user.rb
Merge branch 'master' into query

Conflicts:
	app/controllers/sessions_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb