One question
Merge branch 'master' of https://github.com/termeneder/pobquiz.git

Conflicts:
	src/main/resources/data/questions/questions.xml