Fixed some grammatical errors.
Fixed conflict
Fixed conflicted all files
Merge branch 'gh-pages' of https://github.com/Code-for-Miami/es.codeformiami.org into gh-pages