Merge branch 'master' of https://github.com/AnatoleBuccella/vcs-sibbe

Conflicts:
cake lying.rtf
Merge branch 'master' of https://github.com/AnatoleBuccella/vcs-sibbe