Wäggen told me to pull
Merge branch 'master' of github.com:jwanglof/TDP022-Mockup
Merge branch 'master' of github.com:jwanglof/TDP022-Mockup