Adam G & Mostafa added name.
fixed conflicts
fixed conflicts
Merge pull request #14 from NourhanMohamed/c1_adamggg_s0_contact

C1 adamggg s0 contact
nourhan adds info again