Add Bootstrap to Gemfile.
Merge https://github.com/geisler/game_contest_server

Fixing weird stuff in gemfile.lock

Conflicts:
	Gemfile.lock