seeded db and cleaned up multiple pry bindings
Merge branch 'master' into query

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