Khloud added her info
Nourhan Mohamed added her info
Amr Abdelraouf has added his name
Adam G & Mostafa added name.
fixed conflicts
fixed conflicts
Merge pull request #14 from NourhanMohamed/c1_adamggg_s0_contact

C1 adamggg s0 contact
updated conflict in file README.md
Merge branch 'master' of https://github.com/NourhanMohamed/Trial into C2_AmrARaouf_S0_contact

Conflicts:
	README.md
nourhan adds info again
Merge pull request #7 from NourhanMohamed/C4_NourhanMohamed_S0_contact

Nourhan Mohamed added her info
Merge branch 'master' of https://github.com/NourhanMohamed/Trial into C1_Khloud-Khalid_S0_contact

Conflicts:
	README.md

Khloud Khalid added info
Merge branch 'master' of https://github.com/NourhanMohamed/Trial into C1_Khloud-Khalid_S0_contact

Conflicts:
	README.md

khloud added info again
amr new blablabla
Merge pull request #8 from NourhanMohamed/C2_AmrARaouf_S0_contact

Amr Abdelraouf has added his name
khloud added info again!!
Merge pull request #5 from NourhanMohamed/C1_Khloud-Khalid_S0_contact

Khloud added her info
karim edited
karim edited