db
Merge branch 'master' of https://github.com/gmmateev/charity

Conflicts:
	schema.sql