modified:   controleur/profilSubmit.php
	modified:   modele/Tools.function.php
	modified:   modele/User.class.php
	new file:   test.php
	modified:   controleur/blocdroit.php
	modified:   controleur/login.php
	modified:   controleur/profilSubmit.php
	new file:   vue/image/avatar/34/30845509853745e4b6a7323.17360686.jpg
	new file:   vue/image/avatar/36/18640870253745eec4b3b62.30129429.jpg
	new file:   vue/image/avatar/37/120694882353745f7ba7b613.19055140.jpg
	new file:   vue/image/avatar/38/527938455374600c4e0c96.57308901.jpg
	new file:   vue/image/avatar/39/46772536753746403b25d01.55830248.jpg
	modified:   controleur/blocdroit.php
	new file:   config/panierView.php
	modified:   controleur/blocdroit.php
	new file:   controleur/panier.php
	new file:   controleur/panierView.php
	modified:   modele/Produit.class.php
	new file:   vue/panier.php
Merge pull request #1 from eidonia/master

On récupère
	new file:   controleur/contact.php
Merge branch 'master' of https://github.com/Tr4sK/LIG03

Conflicts:
	controleur/contact.php

	modified:   controleur/contact.php
	modified:   controleur/ficheproduit.php
	modified:   controleur/profil.php
	modified:   controleur/profilSubmit.php
	modified:   controleur/routeur.php
	new file:   modele/Contact.class.php
	modified:   vue/form.login.php
	new file:   vue/image/avatar/1/576537445e8514d49.44386795.jpg
	new file:   vue/image/avatar/1/9593537446a73ca8b6.85858183.jpg
	new file:   vue/image/avatar/1/Thumbs.db
	new file:   vue/image/avatar/Thumbs.db
Merge pull request #2 from Tr4sK/master

Maj