201308232042

資料庫更改
Merge branch 'Andy' into develop

Conflicts:
	app/models/game.rb
	db/schema.rb