Final version ready for turnin
Merge branch 'master' into gh-pages