merge?
Merge branch 'groep7' of https://github.com/v1kko/SWE_2013_Groep2 into groep7