Version 1.0

kinda doneish... also deployed to shinyapps
Merge remote-tracking branch 'origin/master'

Conflicts:
	server.R
	ui.R
Merge remote-tracking branch 'origin/master'

Conflicts:
	server.R
	ui.R