initial commit
Merge branch 'master' of github.com:virtualdisaster/cloudie-day

Conflicts:
	.gitignore