Finished S07 Functional but not fully done
Merge pull request #54 from MGhanem/c1_zoheiry_task_s7

Finished S07 Functional but not fully done
fixed dem conflicts