201308191635

Remove :two_points_made
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

使用導覽
201308211554,Add gemfile
201308211758,
Merge branch 'Eric'

Conflicts:
	app/models/record.rb
	app/views/records/_form.html.erb
201308281515
Merge branch 'master' of https://github.com/dream78829/wesport

Conflicts:
	app/models/record.rb
	app/views/records/_form.html.erb
	app/views/records/index.html.erb
201308281516