Merge branch 'Eric' into develop
Merge branch 'Eric' into develop
201308220014,UI

UI更新
Merge branch 'Eric' into develop
bundle updating sqlite3
201308220905,remove gemfile.lock

remove gemfile.lock
201308221427

twopointsmiss名子修正
201308231514

新增model
201308221515,remove Gemfile.lock
Merge branch 'Eric' into develop

Conflicts:
	Gemfile.lock
Merge branch 'Andy' into develop

Conflicts:
	app/controllers/records_controller.rb
	app/models/game.rb
	app/models/record.rb
	app/views/records/_form.html.erb
	app/views/records/index.html.erb
	db/schema.rb
201308221536, Andy merge to develop
Merge branch 'develop' into Eric
201308231711

上傳照片功能
201308221738,change CSS
Merge branch 'Andy' into Eric

Conflicts:
	app/controllers/records_controller.rb
	app/models/game.rb
	app/models/record.rb
	app/views/records/_form.html.erb
	app/views/records/index.html.erb
	db/schema.rb
201308231825

圖片上傳
test
test
201308232042

資料庫更改