readme update
Merge branch 'master' of https://github.com/wsurles/shiny_workshop

Conflicts:
	README.md
readme update