master branch creating a cnflict
Merge branch 'master' into develop

Conflicts:
	MyWork/Addition/Build.build