初始化提交
-modify
Merge https://code.jd.com/wenqvip/python
-modify
-modify
-untrack some file
-untrack out file
-xx
-add .gitignore
-remove test
add ignore
xxxx
Merge https://code.jd.com/wenqvip/python

Conflicts:
	test/.idea/workspace.xml
+add xml parser
-modify format
Merge https://code.jd.com/wenqvip/python
-add chatserver
Merge https://code.jd.com/wenqvip/python
-update proj5
Merge https://github.com/wenqvip/pytuto

Conflicts:
	.gitignore
	README.md