test
blbe
Merge branch 'master' of https://github.com/etienneburdet/hugo

Conflicts:
	public/Publications/publi/index.html
	public/about/index.html
	public/index.html
	public/index.xml
	public/post/first/index.html
	public/post/index.html
	public/post/index.xml
	public/post/second/index.html
	public/post/third/index.html
	public/publications/index.html
	public/publications/index.xml
	public/ressources/Ressources/index.html
	public/ressources/index.html
	public/ressources/index.xml
	public/ressources/latex/index.html
	public/ressources/readings/index.html
	public/ressources/software/index.html
	public/sitemap.xml
	public/tags/productivity/index.html
	public/tags/productivity/index.xml
	public/tags/science/index.html
	public/tags/science/index.xml
	public/tags/urba/index.html
	public/tags/urba/index.xml
rebuilding site jeudi 23 octobre 2014, 17:53:02 (UTC+0200)
rebuilding site jeudi 23 octobre 2014, 19:02:38 (UTC+0200)