first commit, start huoju
Merge branch 'master' of github.com:mygoare/huoju

Conflicts:
	.gitignore