201308231825

圖片上傳
test
test
201308232042

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

Conflicts:
	app/models/game.rb
	app/views/devise/sessions/new.html.erb
201308261318