update readme on master
merge v1.0 on master
reset --hard
reset again
commit once
merge test
Merge branch 'master' of https://github.com/ning-zhao/helloworld

Conflicts:
	README.md
master commit
v1.0 commit