Edit release zip
Merge branch 'master' into gh-pages
Ignore
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
	docs/index.html
nojekyll
Fix links for safari