first commit
commit2
Merge branch 'master' of
https://github.com/DGoethuys/DriesGroepswerkRepo.git

Conflicts:
	Quiz/src/utils/Gregoriaans.java