1
1
1
Merge branch 'master' of https://github.com/satzcoal/GJD

Conflicts:
	db/schema.rb