Merge pull request #2 from islammenshawy2/master

Fixed conflict on the file.
Hi Islam, this is the last commit to differentiate fetch and pull.
Islam ya waty.
Test commit the file only without pushing it.