Mixitup
Merge branch 'catalog' of https://github.com/jayperryworks/petting-zoo into catalog

Conflicts:
	_layouts/catalog.html
	_posts/products/catalogs/spring/2014-04-22-floppy-bunny.md
	_posts/products/catalogs/spring/2014-04-22-handbags.md
	assets/_sass/app.scss