A confilicting commit
Merge branch 'master' of https://github.com/lemonaide512/GitTest

Conflicts:
	hello.py