my changes
Merge branch 'master' of https://github.com/rileycr/AstronomyQuiz

Conflicts:
	Query.java
fixed merging errors