Final Project

Changes to the KeyManagement.java and EncryptionController.java files
Merge pull request #3 from RBifford/master

Final Project