comment continued
Merge branch 'master' of https://github.com/ledebroux/INGI2346-dist-app-design