Added old changes
Merge branch 'master' of https://github.com/andrewJhaeger/CIS_355_Project