set page
Merge branch 'master' of https://github.com/Baltha/E09-PHP

Conflicts:
	app/Views/headerBase.html
Merge branch 'master' of https://github.com/Baltha/E09-PHP

Conflicts:
	app/Controllers/Jerem_controller.php