pull
Merge branch 'master' of https://github.com/ellemorris/drone

Conflicts:
	server.R
	ui.R