Merge branch 'master' of github.com:Thalmann/sw505-rapport
Merge branch 'master' of github.com:Thalmann/sw505-rapport