Merge
Merge branch 'master' of github.com:Lorac/AstroQuizz

Conflicts:
	appInterface/AppFrame.java