Merge pull request #15 from chendaniely/master

Shiny update
Merge pull request #16 from chendaniely/dev-dan

Stop bothering Caitlin