added java docs
Update DiffieHellman_Client.java

Javadocs and formatting added.
added java docs
deletin gkey

deleting these
justins code

updated
keywriter

delete key writer
Merge branch 'staging' into dev_security
added java docs
Merge branch 'dev_security' of https://github.com/AustinHeerwagen/SMU_SoftEng_AVStream into dev_security
Merge branch 'dev_security' into staging

Conflicts:
	src/AVPackageTestClass.java
	src/AVPackageTestServer.java
	src/edu/smu/engr/softeng/horus/security/CryptionManager.java
	src/edu/smu/engr/softeng/horus/security/KeyManager.java
cyrpiton

messed up
Merge branch 'staging' into dev_security
Merge branch 'dev_security' into staging
finished commits
woops

i forgot to commit these
Merge branch 'dev_security' into staging
Merge branch 'staging' of https://github.com/AustinHeerwagen/SMU_SoftEng_AVStream into staging

resolved conflicts, you guys did not hvae our new code

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