Progress
Merge branch 'master' of https://github.com/glenngs/CSSE374_24hrPush
Framework Commit