get working
Merge branch 'master' of github.com:ledebroux/INGI2346-dist-app-design