sprint 3
Merge branch 'master' of https://github.com/Thalmann/swf613-rapport