Merge branch 'master' of https://github.com/gexianglin/habbyge

Conflicts:
	Readme.md
Merge branch 'master' of https://github.com/gexianglin/habbyge