B-00005 Hope nobody committed before me

+review ENT
Merge branch 'B-00005/Change-some-files' into develop

Conflicts:
	Octocats/GaryOctocat.txt
	Octocats/mlusby.txt
	Octocats/redOctocat.txt