blocage rotation
Merge branch 'master' of https://github.com/romainbiard/direct-energy-hackathon