Working on the filter
Merge branch 'master' of github:erhlee-bird/block-market

Conflicts:
	app/templates/listings.html