v
Merge branch 'master' of https://github.com/Max311/Projet-PHP

Conflicts:
	model.php
Merge branch 'master' of https://github.com/Max311/Projet-PHP
Merge branch 'master' of https://github.com/Max311/Projet-PHP
Merge branch 'master' of https://github.com/Max311/Projet-PHP