Added info Ahmed ElSafty
Edited info Ahmed ElSafty
solved conflict
Merge pull request #13 from Saftophobia/SM_Safty_Add_Info

Added info Ahmed ElSafty
Added Yomn El-Misitkawy