README updated
README updated
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	README.md