Fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/danielbretzigheimer/quizjump/app/GameScreen.java
Merge remote-tracking branch 'origin/master'
Fixes