nihaoa
Merge branch 'master' of https://github.com/bianliangpai/Hello-World

Conflicts:
	ReadMe.md