Cleaned up conflicts added the name of for a link for Simon who was missing the words/characters to click to link to his page.
Merge branch 'master' of https://github.com/medhatelmasry/ethiopia