Zoheiry cleaned up a few things
Merge branch 'c1_dummy_master' of https://github.com/MGhanem/smartsoft-13 into cleaning_up_new
More cleanUps
Fixed Conflicts, everything cleaned up, everything functional
Merge pull request #63 from MGhanem/isA_yekoon_2a5er_branch

Allahoma tawelik ya roo7