Merge pull request #8 from CodeForAfricaLabs/develop

Merge develop
Production added #2
Merge pull request #9 from CodeForAfricaLabs/master

Merge from master