Final version
Merge branch 'master' of github.com:Lucas-Vanryb/Encryption