reberge
changes
fresh build
Merge pull request #170 from luciddesign/blackenbrook

cart link in nav and crossfade slider
merge in cross fade slider from public
do not use collection image if it isn't defined
merge and rebuild
Merge branch 'master' into chateauboutique
Grunt
move collection description into own section
deep link variants
variant image switcher
show variant image/link to variant on cart.liquid
Merge pull request #1 from luciddesign/feature/variant_images

Feature/variant images
fix window width container
Sold out label
Merge branch 'master' into chateauboutique

Conflicts:
	Bootstrapify.zip
Grunt
Merge pull request #171 from luciddesign/chateauboutique

Featured Collection Image and Sold Out label
bottom margin for product variants