first commit
Merge branch 'master' of https://github.com/tasukuapp/tasuku

Conflicts:
	.gitignore