enlevé la marde a mic
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/Knuk/TestEquipe

Conflicts:
	README.md