Rette
Review and minor corrections
Merge local into master
Merge branch 'master' of https://github.com/Thalmann/sw505-rapport