fixed header
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/header.php
Merge branch 'master' of https://github.com/ggerard2/MChocolat