#2: Added new Game class
#3: add ability to search for a game by the city in the model level
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/game.rb
	test/unit/game_test.rb