Error solve
Merge branch 'master' of https://github.com/DnickC/Quiz.git

Conflicts:
	PracticumJavaQuiz/src/utils/DatumFromScratch.java