添加 README 信息
Merge branch 'master' of github.com:dreamersdw/kolibro

Conflicts:
	README.md