removed things
Merge branch 'master' of https://github.com/calblueprint/elevate-africa into charles-blog
whoops my bad
fixed errors
merge conflicts
Merge pull request #5 from calblueprint/charles-blog

removed things