Updating stuff
Merge https://github.com/bhoeksem/game_contest_server

Conflicts:
	Gemfile.lock
Trying to pull