fixed up a couple bugs/cleaned up
Merge https://github.com/COMP2404/RepoYourCar

Conflicts:
	Control.cpp

Not sure if this will work..(got that back up ready)