blabla commuit
blabla commuit new
Merge remote-tracking branch 'origin/master'

Conflicts:
	squelettes/article.html