testing

use this class to test, anything outside of the encrypt and decrypt
function and the streams we will have to figure where we want that to
be done in the code
Merge branch 'staging' into dev_security
switched up diffie

fixed diffiehellman
diffie

connecting diffie hellman exchange and crytionmanager
diffiehellman

took out the keyMan.getSpec()
Merge branch 'dev_security' into staging

Conflicts:
	src/edu/smu/engr/softeng/horus/security/CryptionManager.java