Documentation 1 Dec 2 sprint
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Documentation 3 Dec 2 sprint