Merge branch 'master' of github.com:eMicroGraph/phillips-bakery

Conflicts:
	schema/phillips.sql