Removed todo
Merge branch 'master' of https://github.com/Thalmann/sw505-rapport
Merged github-repo into local branch.
Merge branch 'master' of https://github.com/Thalmann/sw505-rapport
Added todos
Merge branch 'master' of https://github.com/Thalmann/sw505-rapport