README.md
added my ID and Name
fixed conflict
Merge pull request #2 from ndomar/c2_AhmedOsama_T7

README.md
fixed conflicts