control gui changes
Merge branch 'master' of https://github.com/gooftroop/CS6310P3.git

Conflicts:
	src/EarthSim/ControlGUI.java
	src/EarthSim/widgets/QueryWidget.java