no big changes after talking to Lars, added todo.
Merge branch 'master' of https://github.com/jocklas/devguiGroup8
Revert "no big changes after talking to Lars, added todo."

This reverts commit 052af7f887b3456ad5bff5e925129261bd678fc3.