final phase
Merge https://github.com/EsraaSalem/SWE_Project