a commit so we can merge w/ the master
Merge branch 'master' of https://github.com/aaronjfisher/Adaptive_Shiny
book-keeping for merge