error checking works
error checking
Merge branch 'master' of github.com:COMP2404/RepoYourCar

Conflicts:
	Control.cpp
	Control.h
	WindowApp.cpp
	WindowApp.h
new shit