mise à jour conecté ou pas
heu
Merge branch 'master' of https://github.com/roulili/iteachyou
sebMerge branch 'master' of https://github.com/roulili/iteachyou
seb
seb
Merge branch 'master' of https://github.com/roulili/iteachyou

Conflicts:
	Vues/includes/profile/profile.php