merge -> pull
Merge branch 'master' of https://github.com/etienneburdet/hugo

Conflicts:
	public/Publications/publi/index.html
	public/Vita/cv/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/sitemap.xml
	public/vita/index.html
	public/vita/index.xml
rebuilding site mardi 14 octobre 2014, 11:22:56 (UTC+0200)