test git commit

are you ok
Merge branch 'master' of https://github.com/hoverming/eat_cherry

Conflicts:
	README.md