Added Simulation.java because YOLO
Merge branch 'mason-base' of github.com:JayH5/hons-simulator into mason-base

Conflicts:
	src/main/java/za/redbridge/simulator/Simulation.java