Suzanne's work for the last week
Merge branch 'gh-pages' of github.com:dtkaplan/Summer-2013 into gh-pages