Phase 1-b
Merge branch 'master' of https://github.com/maielsheikh/SWEPROJECT