gregg modify the readme
Merge branch 'master' of https://github.com/zhaomengru2015/test

Conflicts:
	readme