forcing conflict
Fixed
1234
Merge branch 'master' of https://github.com/clone11/cloudserver

Conflicts:
	CloudServer/Program.cs