Merge branch 'c1_adamggg_task_models' of https://github.com/MGhanem/smartsoft-13 into c1_khloud-khalid_task_s1
Merge branch 'c1_dummy_master' of https://github.com/MGhanem/smartsoft-13 into c1_khloud-khalid_task_s1
Merge branch 'c1_dummy_master' of https://github.com/MGhanem/smartsoft-13 into c1_khloud-khalid_task_s1
Merge branch 'c1_dummy_master' of https://github.com/MGhanem/smartsoft-13 into c1_khloud-khalid_task_s1
Merge pull request #54 from MGhanem/c1_zoheiry_task_s7

Finished S07 Functional but not fully done
Khloud finished s6: functional but not done
Zoheiry & Khloud fixed conflicts