GH pages Cname
Merge branch 'catalog' into gh-pages
Merge branch 'catalog' into gh-pages

Conflicts:
	CNAME
updated config for photos
trying a text area for photos instead
updated post titles to separate out size info
reworked photos & thumbnail metadata

trying to simplify
fixed markdown syntax
updated product layout for new photo setup
Created 2014-04-23-product-name.md
Updated 2014-04-23-product-name.md
added mixitup lib for filters
Merge branch 'gh-pages' into catalog