Merge pull request #12 from CodeForAfrica/gh-pages

merge master with changes from gh-pages