test
Merge branch 'master' of https://github.com/timphan/shiny

Conflicts:
	ui.R