Updates from last class.
Merge branch 'gh-pages' of github.com:bakercp/ExperimentalMedia2014 into gh-pages