Switch from masonry to columns
Merge branch 'master' of https://github.com/mflorence99/pi-ware

Conflicts:
	public/mt/views/gallery/products/products.less