Merge branch 'master' into Eric

change two_points_made
game
201308201610

123
Merge branch 'Eric' into develop
Merge branch 'Eric' into develop
Merge branch 'Eric' into develop
201308221427

新增game欄位，刪除球員記錄會爆掉的bug
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
Merge branch 'develop' into Eric
201308221738,change CSS