conflict resolution
Merge branch 'master' of https://github.com/pimotte/EWI3620TU-GROUP11