MaN
Merge branch 'master' of https://github.com/thibautha/ProjetPHP

Conflicts:
	app/Views/home.htm
Merge branch 'master' of https://github.com/thibautha/ProjetPHP