Merge branch 'master' of https://github.com/manuelseromenho/quizmaster3001

Conflicts:
	perguntas.txt