init
Merge branch 'master' of github.com:kevinzhow/WeChat_Treehole

Conflicts:
	.gitignore