git is om zeep

Signed-off-by: Pieter-Jan Van de Perre <pieter-jan.vandeperre@student.kdg.be>
Merge branch 'master' of https://github.com/Jasera/SoftwareDevelopment