Added bootstrap and started design
Merge branch 'master' into HEAD

Conflicts:
	app/controllers/.game_controller.rb.swp
	app/models/.game.rb.swp
	test/models/.game_test.rb.swp