empty project
Merge branch 'master' of https://github.com/cyrilbarragan/kujira-mail

Conflicts:
	.gitignore
	README.md