Merge branch 'dev_security' of https://github.com/AustinHeerwagen/SMU_SoftEng_AVStream into dev_security

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

IT’s saying cryptionmanager is a conflict, i am not sure why but I have
it backed up in case it is deleted