write something for point 8
Merge branch 'master' of https://github.com/Project-Props/Delrapport-2