Initial commit
Merge github.com:diginside/cloud

Conflicts:
	.gitignore