Merge branch 'master' of github.com:ChrisBeeley/shinyapp2

Conflicts:
	server.R
Merge branch 'master' of github.com:ChrisBeeley/shinyapp2