Big Update
Merge branch 'Dupe' of https://github.com/mfoley6052/ICS4UFinal into Dupe