rebase test
Merge branch 'master' of https://github.com/ian-qiu/python into mytest

Conflicts:
	hello.py
Merge pull request #1 from ian-qiu/mytest

Mytest