add sphinx output stuff to gitignore
generate
add .nojekyll
Merge branch 'master' into gh-pages
generate
Merge branch 'master' into gh-pages
generate
Merge branch 'master' into gh-pages
generate
add regenerate_github_static_files.sh
Merge branch 'master' into gh-pages
generate
Merge branch 'master' into gh-pages
generate
Merge branch 'master' into gh-pages
generate
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
generate
Merge branch 'master' into gh-pages
generate