Added javadoc and formatting
Merge branch 'master' of https://github.com/chriskurn/SE350

Conflicts:
	src/simulator/Simulator.java