201308191635

Remove :two_points_made
Merge branch 'Eric' into Andy

Conflicts:
	app/views/records/_form.html.erb