init
Merge branch 'master' of https://github.com/djodjoni/tarator

Conflicts:
	.gitignore