fixed a bug
Merge branch 'earlier-messaging' of https://github.com/gooftroop/CS6310P2 into earlier-messaging

Conflicts:
	src/EarthSim/Controller.java