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

Conflicts:
	src/Simulation.java
tyler
tyler
change simulation and program
program