Phase 3
Merge branch 'master' of https://github.com/A-T-Hafez/SWE1