Merge pull request #167 from luciddesign/chateauboutique

Product tabs and collection featured image
Merge branch 'master' into ashhilton
Grunt compile
main product thumbnail based on container width
collection featured image bug
Merge pull request #168 from luciddesign/ashhilton

main product image size and collection featured image bug
Grunt
bring cart count back to top nav bar
zip
crossfade slider funtionality
Merge pull request #170 from luciddesign/blackenbrook

cart link in nav and crossfade slider
Merge branch 'master' into chateauboutique
Grunt