Merge branch 'master' into Eric
201308201600

projression
201308201601Merge branch 'Eric'

Conflicts:
app/models/record.rb
app/views/records/_form.html.erb
Merge branch 'master' into Eric

Conflicts:
	app/models/record.rb
	app/views/records/_form.html.erb
20130821，tips

使用導覽
Merge branch 'Eric' into develop
201308211554,Add gemfile
Merge branch 'Eric' into develop
201308220014,UI

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

remove gemfile.lock
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
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
201308261122,index