Changes from Kenny
Merge branch 'master' of https://github.com/gmuproject/SoftwareProject