up to crc
Merge branch 'master' of https://github.com/FreeTymeKiyan/CryptoFinalProj
Merge