merge conflicts
more work on uc preso
Merge branch 'master' into gh-pages