init
Merge branch 'master' of https://github.com/motephyr/laibaishi

Conflicts:
	.gitignore