Please god

give me strength
Merge branch 'Jay' into Jason-Branch

Conflicts:
	SpeedSolver/game/Race.py
Merge branch 'Jason-Branch'

Conflicts:
	SpeedSolver/game/Race.py