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

Conflicts:
	Gemfile.lock
testing with nav bar