r
s
Merge branch 'Test1' of https://github.com/LeilaWP/Spoon-Knife into Test

Conflicts:
	index.html
t
u
v
Merge remote-tracking branch 'origin/Test1' into Test

Conflicts:
	index.html
petit test
petit test ..
petit test !
petit test :)
voila
voila !
yop
Yop yop !
Merge branch 'Test' of https://github.com/LeilaWP/Spoon-Knife.git

Conflicts:
	index.html
YOP YOP