register for events
Merge branch 'master' of github.com:CodeGurus1234/FTC-Robotics

Conflicts:
	app/controllers/events_controller.rb~
	app/views/teams/show.html.haml
	app/views/teams/show.html.haml~