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

Conflicts:
	server.R
	ui.R
2 columns
Merge branch 'master' of github.com:ellemorris/drone into form
pulling
Merge branch 'form' of github.com:ellemorris/drone into form