Tasks 8, 9, and 11
Merge branch 'master' of https://github.com/AdamTakvam/EncryptKeeper