Maged Shalaby, changed readme
fixed conflicts
Recommit to fix Hossam's merge
Hopefully last fix, merge me
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