Testing
hgjm
Merge branch 'master' of https://github.com/HappiestTeam/CloudPOC

Conflicts:
	CloudPOC.RestAPI/Controllers/HomeController.cs