Added questions
Merge branch 'master' of https://github.com/andrewtsoc/WWTBAM

Conflicts:
	data/questions.xml
Merge errors fixed.