no commit
Merge branch 'master' of https://github.com/tylerphelan/project4

Conflicts:
	src/SimulationController.java
tyler changes to simulation
Merge branch 'master' of https://github.com/tylerphelan/project4
merging program, simulation, simulation controller