schema.sql formatting edited to perform conflict solving and prevent it from changes
Merge branch 'master' of https://github.com/volterr/FavorTripPals

Conflicts:
	install/schema.sql

+gource script