Documentation 6§ Dec 3 sprint
Merge remote-tracking branch 'origin/master'