Page a propos
Merge branch 'master' of https://github.com/Stimboy/Bootstrap

Conflicts:
	header.php
Merge branch 'master' of https://github.com/Stimboy/Bootstrap

Conflicts:
	style.css