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