initial commit
Merge branch 'master' of https://github.com/goujonpa/cabaret

Conflicts:
	README.md