fixed copy error in Gerald Amos's intro
Merge pull request #70 from sarahmagrish/gh-pages

fixed copy error in Gerald Amos's intro
headshots for edwin and lola
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Merge branch 'gh-pages' of ../commonplace into gh-pages