fin de journe difficile...
Merge branch 'master' of https://github.com/Babouchot/Conquistador