Merge branch 'c4c.staging.schoolinfo' into c4c.staging
Merge branch 'c4c.staging.hotfix' into c4c.staging

Conflicts:
	db/development_structure.sql
Merge branch 'c4c.staging.hotfix' into c4c.staging
Merge branch 'c4c.staging.schoolinfo' into c4c.staging
Merge branch 'c4c.staging.discover-v2' into c4c.staging

Conflicts:
	db/development_structure.sql
	public/stylesheets/style.css
Merge branch 'c4c.staging.discover-v2' into c4c.staging

Conflicts:
	db/development_structure.sql
Merge branch 'c4c.staging.discover-v2' into c4c.staging
Merge branch 'c4c.staging.discover-v2' into c4c.staging
Merge branch 'c4c.staging.timestamp_contacts' into c4c.staging
Merge branch 'c4c.staging.timestamp_contacts' into c4c.staging
Merge branch 'c4c.staging.discover-v2' into c4c.staging

Conflicts:
	public/stylesheets/style.css
Merge branch 'c4c.staging.hotfix' into c4c.staging
Merge branch 'c4c.staging.discover-v2' into c4c.staging
Merge branch 'c4c.staging.discover-v2' into c4c.staging
Merge branch 'c4c.staging.hotfix' into c4c.staging

Conflicts:
	db/development_structure.sql
	public/stylesheets/style.css
Merge branch 'c4c.staging.hotfix' into c4c.staging
Merge branch 'c4c.staging.editschool' into c4c.staging
Merge branch 'c4c.staging.hotfix' into c4c.staging
Merge branch 'c4c.staging' of github.com:andrewroth/ministry-tracker into c4c.staging
Merge branch 'c4c.staging.hotfix' into c4c.staging