Fix colors
Update README
Update logo
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #3 from rmasoni/master

Fix colors, update README, update logo