Maged Shalaby, changed readme
fixed conflicts
Recommit to fix Hossam's merge
updated my bio
new bio + jihad
Update BIO.txt

6th
my bio
6th
Hopefully last fix, merge me
Merge pull request #23 from ndomar/C3_Derwy_Updates_Bio

C3 derwy updates bio
Merge branch 'master' of https://github.com/ndomar/megasoft-13 into C4_Maged_updates_BIO
Maged Bio 1
Merge pull request #24 from ndomar/C4_Maged_updates_BIO

C4 maged updates bio
Updated the bio