z
Merge branch 'master' of
https://github.com/JeroenKurvink/HelloD-Aopdracht1.git

Conflicts:
	src/Algoritme1.class
	src/Algoritme2.class
	src/Algoritme3.class
	src/JUnitAlgoritme1.class
	src/Main.class