Merge pull request #12 from CodeForAfrica/gh-pages

merge master with changes from gh-pages
Merge pull request #13 from CodeForAfrica/master

Merge pull request #12 from CodeForAfrica/gh-pages