credits
Merge branch 'master' of https://github.com/maisondeseditions/in-quarto

Conflicts:
	js/layout.js