registration
Merge branch 'master' of github.com:CodeGurus1234/FTC-Robotics

Conflicts:
	app/controllers/users_controller.rb