Merge branch 'Jason-Branch'

Conflicts:
SpeedSolver/game/speedSolver.py