Somehow it reverted
Merge https://github.com/bhoeksem/game_contest_server

Conflicts:
	app/controllers/sessions_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/views/layouts/application.html.erb