I dont know
Merge branch 'master' of https://github.com/mbskot2/VAMZ

Conflicts:
	bin/classes/com/example/numbers/QuizActivity.class
	bin/classes/com/example/numbers/QuizResultFragment.class
	bin/classes/com/example/numbers/QuizSettingsFragment.class
	bin/classes/com/example/numbers/logic/Quiz.class
	src/com/example/numbers/logic/Quiz.java