My theme customization from 'iris'
Merge branch 'master' of https://github.com/jmaister/blog

Conflicts:
	pelicanconf.py