maj
Merge branch 'master' of https://github.com/remy-poirier/Bootstrap

Conflicts:
	header.php