Moved some stuff around and added a timer to centralize the simulation.
Merge branch 'master' of https://github.com/cisprocess/skk-cs4230-project-1