Bouton Troc
Merge branch 'master' of https://github.com/Nymphadelle/Phyllali
Profil utilisateur + Listes souhaits
Merge branch 'master' of https://github.com/Nymphadelle/Phyllali

Conflicts:
	Resources/javascript.js
	Resources/style.css
	ajax/listeSouhaits.php
	index.php