init
Merge branch 'master' of github.com:icemanpro/kuaiso

Conflicts:
	.gitignore