Merge branch 'gh-pages' of https://github.com/larsrose/larsrose into gh-pages

Conflicts:
	README.md