CCan you tell what is differnt
Merge branch 'master' of github.com:newdynamx/devOps

Conflicts:
	name.txt