add ahmed magdi
fix conflict
fix conf
fix again
Merge pull request #6 from alaashafaee/C2_magdi_add_info

add ahmed magdi