Add README.md
Add icon
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md