Merge remote-tracking branch 'origin/Jay's-Branch' into Nick's-Branch
Merge remote-tracking branch 'origin/master' into Nick's-Branch
Merge remote-tracking branch 'origin/master' into Nick's-Branch
Merge pull request #13 from mreist/master

Getting Master
Indentation and Added buttons

Fixed indentations (spaces instead of tabs) in MainScreen, Options.
Added/fixed button to go from MainScreen to Race.
Merge branch 'master' into Nick's-Branch
Added Garage/Leaderboard

Created new Garage py file with scene and sprite
Could not get the click event to work yet
Also added new leaderboard py that has a scene
Added some more images for the Option Menu

checkboxes and checkmarks
Garage
Merge remote-tracking branch 'origin/Jay's-Branch' into Nick's-Branch
Updated Garage

When you click garage it goes to that scene
Leaderboard Scene
Commiy
Merge pull request #14 from mreist/Nick's-Branch

Nick's branch
Option Menu has checkboxes now
Merge branch 'master' of https://github.com/mreist/Team-Titan

Conflicts:
	SpeedSolver/game/Options.py
	SpeedSolver/game/Options.py~
	SpeedSolver/game/Vehicle.py
	SpeedSolver/game/__init__.py~
Merge pull request #15 from mreist/master

Getting MAster
Fixed Option's Class
Merge pull request #16 from mreist/Jay's-Branch

Fixed Option erros
Update from master