fixes
fixes
Merge branch 'master' of https://github.com/gooftroop/CS6310P2

Conflicts:
	src/simulation/Earth.java