merge test
Merge branch 'master' of https://github.com/ning-zhao/helloworld

Conflicts:
	README.md