General fixes

in both CarPark and CarParkTests
Conflict fixes

Conflicts:
	CarParkSimulator/src/asgn2Tests/CarParkTests.java