Merge pull request #9 from CodeForAfricaLabs/master

Merge from master
Production move

#2
Merge pull request #10 from CodeForAfricaLabs/develop

Merge from Develop