...
...
Merge branch 'master' of github.com:gindyo/com-gar

Conflicts:
	sites/default/db.sql
...