first commit, version 0.0.0-1
Merge branch 'master' of github.com:sepmein/kokiya

Conflicts:
	.gitignore
bumped to -2