layout
Revert "layout"

This reverts commit 7daf2a7d9ba2d898a81f5eeff6f51a1c205d0436.
Revert "Modifs layout"

This reverts commit 005711ddef578a87aff8c14e429c9441ea8a1d29.
Merge branch 'master' into gh-pages

Conflicts:
	apropos.html
ignore