Add Bootstrap to Gemfile.
Merge branch 'master' of https://github.com/geisler/game_contest_server

Conflicts:
	Gemfile.lock
Integrated some bootstrap
Removed Gemfile.lock from repo
Fixed some merging issues
Merge branch 'dev'