Made corrections and minor re-writes
Merge branch 'master' of https://github.com/Thalmann/sw505-rapport
Added todo
Added todo
Added todo