folder change

fixed the softengr to softeng and fixed the packaging
fixed spacing in this file to 6 spaces

fixed spacing
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
Merge pull request #12 from AustinHeerwagen/dev_security

Pushing all updates to security