This is my python
I have pull from the github
new commit
修改了file里的内容
Update file.txt
新的修改内容
update the ex2.py
update all the changed files
added a txt
Merge https://github.com/BillionWang/python

Conflicts:
	README.md