change setup
change setup
Merge branch 'master' of github.com:DigitalResearchCentre/api

Conflicts:
	setup.sh