Merge branch 'Jason-Branch2'
Merge branch 'Jason-Branch2'
Stuff
Updated Spyral and added feedback
uh
uh
Fixes?
Merge branch 'Jason-Branch2'
oo
Merge branch 'master' of https://github.com/mreist/Team-Titan
LET'S SEE IF THIS WORKS
Delete Race.py~
Merge branch 'master' of https://github.com/mreist/Team-Titan

Conflicts:
	SpeedSolver/game/Race.py
	SpeedSolver/game/Race.py~
Merge remote-tracking branch 'origin/master' into Nick's-Branch