initial commit
Merge branch 'master' of github.com:morieskie/mukuru

Conflicts:
	.gitignore
	README.md