mise a jour de jekyll
Merge branch 'master' of github.com:sieben/sieben.github.com

Conflicts:
	.travis.yml