GIGXIAGSC
Merge branch 'Testing' of https://github.com/HappiestTeam/CloudPOC into Testing

Conflicts:
	TextFile1.txt