Modif README emoticons (merge)

Conflicts:
	README.md