Merge remote-tracking branch 'remotes/origin/staging' into dev_gui
Merged with staging
Reverting security's change to cominfra code
Merge branch 'staging' into dev_security
Merge branch 'staging' into dev_security
fixed encrpt header issue

testing out diffiehellman key exchange
Pushing current AV into Staging
diffie key exchange

two cases added to message handler for 2 new messages
DiffieHellman_Client/Server

all is handled in recievePartneyKey() and setPartnerKey() in the
interface class DiffieHellman. text me if anyone has questions.

Still needs testing
Merge pull request #17 from AustinHeerwagen/dev_security

Dev security
AVPackager and AVMessenger changed to call cominfra and security functions
Commented out encrypt to test cominfra functionality within AVPackager
Fixing library paths and added exception handling
Merge branch 'staging' of https://github.com/AustinHeerwagen/SMU_SoftEng_AVStream into staging
Added try catch around encryptPayload
Added handling for video message type
Created AVPackageTestServer.java
Changed bais to byte[] for avMessenger and avPackager

Still need to change in avReceiver
Adding error checking (tmgriffin)
update .gitignore to ignore .mpeg, .wav, mac&win
Continuing the updates