test
Merge branch 'master' of github.com:romainx/romainx.github.com

Conflicts:
	Makefile
	pelicanconf.pyc
	publishconf.pyc