Fixed Conflict with omar
Merge pull request #41 from Infinity-3A3/Raed

Fixed Conflict with omar