url problem solve
Merge branch 'master' of github.com:maggick/blog

Conflicts:
	pelicanconf.py