changes to hello.py in another
Merge branch 'master' of https://github.com/c1427849/Cm1101

Conflicts:
	hello.py