prepare for merge
Merge branch 'master' of https://github.com/aaronjfisher/Adaptive_Shiny