modify readme
add emoicon
Merge branch 'conflict'

Conflicts:
	README.md