first commit of diamonds example
Merge branch 'master' of github.com:sarahkoo/shiny