display 'fone' in browser
Merge remote-tracking branch 'origin/master'

Conflicts:
	ui.R