new start
working on index
Merge branch 'master' of github.com:glyg/damcb.com

Conflicts:
	.gitignore
	conf.py
	files/logo_image.svg
	files/logo_omero.svg
	files/logo_python.png
	posts/setting-up-a-scientific-python-working-environment.md