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

Conflicts:
	index.html
h
j
k
l
voila
voila voila
Yep
voila voila !!
lala
Merge branch 'Test2' into Test

Conflicts:
	index.html
m
Merge branch 'Test1' of https://github.com/LeilaWP/Spoon-Knife into Test

Conflicts:
	index.html
n
o
p
q
Merge branch 'Test1' of https://github.com/LeilaWP/Spoon-Knife

Conflicts:
	index.html
R