updated README
updated README
updated color
web export
Merge branch 'master' into gh-pages

Conflicts:
	README.md