Merge pull request #51 from mreist/master

MERGEEEEEEEEEEEEE
Merge branch 'Jason-Branch'
Merge remote-tracking branch 'origin/master' into Jay
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
Please god

give me strength
Merge branch 'Jason-Branch'

Conflicts:
	SpeedSolver/game/Race.py
Updated with Jason's changes
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 Player/Results to my Branch

From Jasons
Correct Title