Prepare to merge...
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/art-africa