sleepy
Merge branch 'master' of https://github.com/timohtey/Memoir.git

Conflicts:
	res/layout/activity_quiz_phase.xml
	src/com/example/memoir/QuizPhaseActivity.java