add Danny's name to resampling item
schedule and slide updates
Merge branch 'gh-pages' of github.com:rpruim/icots2014 into gh-pages
schedule updates