little commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	View/header.php
Merge branch 'master' of https://github.com/Berbouche/ExiaStoreProjet