Move time knowledge to the Simulation class.
Bump up frame rate to 1000.  Correct spelling error.
Merge branch 'master' of https://github.com/dndodson/cs6310-project2.git
Merge branch 'master' of https://github.com/dndodson/cs6310-project2.git

Conflicts:
	src/presentation/Presenter.java
Merge branch 'master' of https://github.com/dndodson/cs6310-project2.git

Conflicts:
	src/presentation/Presenter.java
	src/simulation/Simulator.java