Made a few more changes to the UserQueryInterface GUI
Merge branch 'test' of https://github.com/csamuel6/6310_P3.git into test

Conflicts:
	src/EarthSim/main/UserQueryInterface.java
Merge branch 'test' of https://github.com/csamuel6/6310_P3.git into test

Conflicts:
	src/EarthSim/persistance/DataManager.java