ok
Merge branch 'master' of ssh://github.com/mada3k/ghcloud

Conflicts:
	.gitignore