Initial commit
huoshi im server
.gitignore updated
Merge branch 'master' of http://github.com/EricleeCrystal/huoshi

Conflicts:
	.gitignore
	README.md