initial commit
Merge branch 'master' of github.com:ergonotics/cmabulle

Conflicts:
	.gitignore