Update README.md
Merge branch 'gh-pages'

Conflicts:
	README.md
Update README.md
Merge branch 'master' into gh-pages