Initial
Merge branch 'master' of https://github.com/humwerthuz/wasabi

Conflicts:
	.gitignore