This schema.
Merge branch 'master' of github.com:jamesread/upsilon

Conflicts:
	var/schema.sql