Conflicts.
Merge branch 'master' of https://github.com/SuperPignouf/crypto2
Merge branch 'master' of https://github.com/SuperPignouf/crypto2