Erreur de merge.
Merge branch 'master' of https://github.com/xmoulin/raspberry