changes
Merge branch 'master' of https://github.com/marma/starch

Conflicts:
	examples/package.ttl