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
Khloud finished s6: functional but not done
khloud fixed conflicts in s6/s7
fixed dem conflicts
Merge pull request #56 from MGhanem/c1_khloud_task_s6

C1 khloud task s6