yay no more merge conflicts
Merge branch 'groep_acht' of github:v1kko/SWE_2013_Groep2 into groep_acht