with conflicts
Merge branch 'master' of https://github.com/HappiestTeam/CloudPOC

Conflicts:
	TextFile1.txt