* It was a routing problem!
Merge branch 'master' of github.com:Dacilndak/FRC-3729-Web

Conflicts:
	app/controllers/users_controller.rb