Updated the css files
game controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/game_controller.rb
	app/views/game/index.html.erb
	db/seeds.rb
added style to game