Small fixes
Merge branch 'groep7' of github.com:v1kko/SWE_2013_Groep2 into groep7