test
Merge branch 'master' of https://github.com/wtnbjn/wtnbjn.github.io

Conflicts:
	pelicanconf.pyc
	world.html