removing non-master branch file
Merge branch 'master' into atomo

Conflicts:
	updateFromOriginal