Pre-pull merge
Merge branch 'master' of https://github.com/redshirt07/INB370

Conflicts:
	CarParkSimulator/.classpath
Some indications for the testCarIsDissatisfied() method