Updated with Jason's changes
Merge remote-tracking branch 'origin/Jay'

Conflicts:
	SpeedSolver/game/Race.py
Merge branch 'master' of https://github.com/mreist/Team-Titan