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

Conflicts:
AstroQuiz.java
astro quiz