After trying shitty search gems and other plugins for over 2.5 hours, I came up with this. Should be enough. If not, screw you!
Merge branch 'dev' into feature/search

Conflicts:
	app/models/auction.rb
Resolved merge conflicts.
Merge branch 'feature/search' into dev