Update README.md
Update README.md
put funtions in ui.R and server.R
Merge remote-tracking branch 'origin/kirk'
minor
minor
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md