page a propos2
Merge branch 'master' of https://github.com/antoninab/wordpress

Conflicts:
	wp-content/themes/strappress/style.css
conflit