Synced with Dr. Geisler's repo
Merge branch 'master' of https://github.com/BoringCode/game_contest_server

Conflicts:
	README.rdoc
Updated to pass tests