pre-commit before merge
Merge branch 'master' of https://github.com/volterr/FavorTripPals

Conflicts:
	install/schema.sql
no message