fixed another bug
Merge branch 'master' of https://github.com/v1kko/SWE_2013_Groep2