first commit
Merge https://github.com/alialmuhanna/carparksim

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	Assign2/doc/allclasses-frame.html
	Assign2/doc/allclasses-noframe.html
	Assign2/doc/asgn2CarParks/CarPark.html
	Assign2/doc/asgn2CarParks/class-use/CarPark.html
	Assign2/doc/asgn2CarParks/package-frame.html
	Assign2/doc/asgn2CarParks/package-summary.html
	Assign2/doc/asgn2CarParks/package-tree.html
	Assign2/doc/asgn2CarParks/package-use.html
	Assign2/doc/asgn2Exceptions/SimulationException.html
	Assign2/doc/asgn2Exceptions/VehicleException.html
	Assign2/doc/asgn2Exceptions/class-use/SimulationException.html
	Assign2/doc/asgn2Exceptions/class-use/VehicleException.html
	Assign2/doc/asgn2Exceptions/package-frame.html
	Assign2/doc/asgn2Exceptions/package-summary.html
	Assign2/doc/asgn2Exceptions/package-tree.html
	Assign2/doc/asgn2Exceptions/package-use.html
	Assign2/doc/asgn2Simulators/Constants.html
	Assign2/doc/asgn2Simulators/Log.html
	Assign2/doc/asgn2Simulators/SimulationRunner.html
	Assign2/doc/asgn2Simulators/Simulator.html
	Assign2/doc/asgn2Simulators/class-use/Constants.html
	Assign2/doc/asgn2Simulators/class-use/Log.html
	Assign2/doc/asgn2Simulators/class-use/SimulationRunner.html
	Assign2/doc/asgn2Simulators/class-use/Simulator.html
	Assign2/doc/asgn2Simulators/package-frame.html
	Assign2/doc/asgn2Simulators/package-summary.html
	Assign2/doc/asgn2Simulators/package-tree.html
	Assign2/doc/asgn2Simulators/package-use.html
	Assign2/doc/asgn2Vehicles/Car.html
	Assign2/doc/asgn2Vehicles/MotorCycle.html
	Assign2/doc/asgn2Vehicles/Vehicle.html
	Assign2/doc/asgn2Vehicles/class-use/Car.html
	Assign2/doc/asgn2Vehicles/class-use/MotorCycle.html
	Assign2/doc/asgn2Vehicles/class-use/Vehicle.html
	Assign2/doc/asgn2Vehicles/package-frame.html
	Assign2/doc/asgn2Vehicles/package-summary.html
	Assign2/doc/asgn2Vehicles/package-tree.html
	Assign2/doc/asgn2Vehicles/package-use.html
	Assign2/doc/constant-values.html
	Assign2/doc/deprecated-list.html
	Assign2/doc/help-doc.html
	Assign2/doc/index-files/index-1.html
	Assign2/doc/index-files/index-10.html
	Assign2/doc/index-files/index-11.html
	Assign2/doc/index-files/index-12.html
	Assign2/doc/index-files/index-13.html
	Assign2/doc/index-files/index-14.html
	Assign2/doc/index-files/index-15.html
	Assign2/doc/index-files/index-16.html
	Assign2/doc/index-files/index-17.html
	Assign2/doc/index-files/index-18.html
	Assign2/doc/index-files/index-2.html
	Assign2/doc/index-files/index-3.html
	Assign2/doc/index-files/index-4.html
	Assign2/doc/index-files/index-5.html
	Assign2/doc/index-files/index-6.html
	Assign2/doc/index-files/index-7.html
	Assign2/doc/index-files/index-8.html
	Assign2/doc/index-files/index-9.html
	Assign2/doc/index.html
	Assign2/doc/overview-frame.html
	Assign2/doc/overview-summary.html
	Assign2/doc/overview-tree.html
	Assign2/doc/package-list
	Assign2/doc/serialized-form.html
	Assign2/doc/stylesheet.css
	Assign2/src/asgn2CarParks/CarPark.java
	Assign2/src/asgn2Exceptions/SimulationException.java
	Assign2/src/asgn2Exceptions/VehicleException.java
	Assign2/src/asgn2Simulators/Constants.java
	Assign2/src/asgn2Simulators/GUISimulator.java
	Assign2/src/asgn2Simulators/Log.java
	Assign2/src/asgn2Simulators/SimulationRunner.java
	Assign2/src/asgn2Simulators/Simulator.java
	Assign2/src/asgn2Tests/CarParkTests.java
	Assign2/src/asgn2Tests/CarTests.java
	Assign2/src/asgn2Tests/MotorCycleTests.java
	Assign2/src/asgn2Vehicles/Car.java
	Assign2/src/asgn2Vehicles/MotorCycle.java
	Assign2/src/asgn2Vehicles/Vehicle.java