a commit to master
merged Merge branch 'master' of https://github.com/ruizeng/test

Conflicts:
	README.md