General fixes and refactoring
Fixing conflict etc

Conflicts:
	CarParkSimulator/src/asgn2CarParks/CarPark.java
	CarParkSimulator/src/asgn2Tests/CarParkTests.java