Small changes and adding a note
Merge branch 'master' of https://github.com/Thalmann/sw505-rapport
Merge branch 'master' of https://github.com/Thalmann/sw505-rapport
Added todo
Resolved merge conflict