Ajout des deux camps
Merge branch 'master' of https://github.com/ITKWeb/xwing