rolling back local database
resolving database conflicts
Merge branch 'master' of github.com:jzanutto/TO-coop-housing

Conflicts:
	.gitignore