second change of ui, without ","
solve conflict

Merge branch 'master' of github.com:yishuihanly/tyr_Rstudio_git

Conflicts:
	ui.R