init
Merge branch 'master' of https://github.com/hscstudio/yiihaa

Conflicts:
	README.md