Edits to Text
Some fixes
Completed Asana Checklist
cname
Merge branch 'master' into gh-pages