.
Merge branch 'master' of github.com:structure-computation/Scetup

Conflicts:
	Makefile
Merge branch 'master' of github.com:structure-computation/Scetup

Conflicts:
	Makefile
ubuntu