Initializing project
Merge branch 'master' of https://github.com/abrandao/kami

Conflicts:
	.gitignore