This test 1
Merge branch 'master' of https://github.com/luoweipeter/studypython

Conflicts:
	README