B
C
D
A
Merge branch 'master' of https://github.com/LeilaWP/Spoon-Knife

Conflicts:
	index.html
E
I
F
Merge branch 'Test1' of https://github.com/LeilaWP/Spoon-Knife CHOIX F

Conflicts:
	index.html
G
Merge branch 'master' of https://github.com/LeilaWP/Spoon-Knife into Test
choix g

Conflicts:
	index.html
h