seb
sebMerge branch 'master' of https://github.com/roulili/iteachyou

Conflicts:
	Vues/home.php