add les echafaudeurs link
fix merge conflicts
Merge pull request #2 from MeKeyCool/master

add les echafaudeurs link