rien
Merge branch 'master' of https://github.com/Stimboy/Bootstrap

Conflicts:
	footer.php
	header.php
	style.css
	style.less