Boom
Lol
Mdr
Merge branch 'Test'

Conflicts:
	index.html
Mdr
Ptdr
Merge branch 'master' of https://github.com/LeilaWP/Spoon-Knife
choix A

Conflicts:
	index.html
C