Merge branch 'Jason-Branch'
Merge pull request #54 from mreist/master

Delete Race.py
Merge pull request #55 from mreist/MaxxTesting

Merge pull request #54 from mreist/master
Please god

give me strength
Merge remote-tracking branch 'origin/Jay'
Merge branch 'master' of https://github.com/mreist/Team-Titan
Merge branch 'Jason-Branch'

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

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

Conflicts:
	SpeedSolver/game/Race.py
Fixing Master
Merge remote-tracking branch 'origin/Nick's-Branch'
Merge branch 'master' of https://github.com/mreist/Team-Titan
Merge remote-tracking branch 'origin/Jay'

Conflicts:
	SpeedSolver/game/Race.py
Merge branch 'master' of https://github.com/mreist/Team-Titan
Adding Results and Player from Jason's Branch
Adding correct Vehicle

Updating the Vehicle file
Updating Mainscreen
Updated Race

Race now has Maxx and Jason commits
Fixing Title
idk what im doing