Hey this is the new message.
This is Curtis Page
Merge branch 'master' of https://github.com/Sniperealistic/Superhustle757

Conflicts:
	app/controllers/users_controller.rb
	app/controllers/users_controller.rb~
	app/models/user.rb
	app/models/user.rb~
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	app/views/users/new.html.erb~
	config/routes.rb
	db/schema.rb
	tmp/pids/server.pid