local change
reconcile

Merge branch 'master' of github.com:Sheffield-Accelerated-VoI/SAVI

Conflicts:
	server.R