by Medhat
Merge branch 'master' of https://github.com/Rafiki-Project/RafikiMain.git