step4
Latest changes
Merge branch 'new'

Conflicts:
	client/views/race/race.js