passing column name from ui.R
Merge branch 'master' of github.com:Jwcrist/Data-Science-Class

Conflicts:
	Data folder/server.R
	Data folder/ui.R