Débuté le point 1
Merge branch 'master' into rech-amis

Conflicts:
	build/classes/com/dinfogarneau/cours526/twitface/controleurs/ControleurMembre.class
	build/classes/com/dinfogarneau/cours526/twitface/modeles/ModeleGestionAmis.class
Debut recherche amis
Merge pull request #6 from TeamBluBlue/rech-amis

Rech amis