update1
Merge branch 'master' of https://github.com/chuanweizhang2013/python-project

Conflicts:
	README.md