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

Conflicts:
	Gemfile.lock
Simple tests for the Bootstrap navigation bar

This test simply checks that we've tried to put in a navigation bar
and the corresponding links.  It needs some fixing that will make it
more specific when a particular bug can be traced, but for now is
"good enough."
Merge branch 'master' of https://github.com/geisler/game_contest_server
Fix within bug.

The within problem that was commented out now works properly with
proper refactoring.
Merge branch 'master' of https://github.com/geisler/game_contest_server