merge
Merge branch 'master' of https://github.com/mik403/logycQuest

Conflicts:
	res/values/questions.xml