testing changes for Ch. 1
Merge branch 'gh-pages' of https://github.com/dtkaplan/Summer-2013 into gh-pages