Panier final
Merge branch 'master' of https://github.com/Tucsky/Bootstrap

Conflicts:
	style.css
Merge branch 'master' of https://github.com/Tucsky/Bootstrap