pattern
Merge branch 'master' of https://github.com/erhlee-bird/block-market
Merge branch 'master' of https://github.com/erhlee-bird/block-market
Merge branch 'master' of https://github.com/erhlee-bird/block-market
bg
Merge branch 'master' of https://github.com/erhlee-bird/block-market
Merge branch 'master' of https://github.com/erhlee-bird/block-market
style updates
Merge branch 'master' of https://github.com/erhlee-bird/block-market

Conflicts:
	app/templates/listings.html