Improves the README
Merge branch 'master' into gh-pages
Improves the README
Merge branch 'master' into gh-pages

Conflicts:
	README.md
Improves the README
Testing doc loading on Github
Merge branch 'master' into gh-pages

Conflicts:
	README.md