Update CONTRIBUTORS.txt
Merge branch 'master' into workshop

Conflicts:
	CONTRIBUTORS.txt