4a/b
Merge branch 'master' of github.com:Toasterman/Crypto_Homework