search/join stuff

What the fuck am I typing?
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb