working
 fuck all this shit
Merge branch 'master' of https://github.com/COMP2404/RepoYourCar

Conflicts:
	Application.cpp
	Application.h
	Control.h~
	Makefile
	Queue.cpp
	Queue.h
	cuTaes