Merge branch 'Jason-Branch'
Merge branch 'Jason-Branch'

Conflicts:
	SpeedSolver/game/Race.py