.
Merge branch 'master' of ssh://github.com/aaltodsg/instans

Conflicts:
	README.md