my schema changed

because of rails. ignore this!
Merge branch 'master' of https://github.com/daf-/coop-site

Conflicts:
	db/schema.rb