Foreign key added
merge
Merge

Conflicts:
	db/schema.rb