init
init
Merge branch 'dev' of github.com:cloud66/c66toolbelt into dev

Conflicts:
	.gitignore
Merge branch 'master' of github.com:cloud66/c66toolbelt into dev