Rebuilt shipping method step to fix mystery of the missing </div>
Merge branch 'checkout-fix'
Resolving overflow conflict re: product gallery vs all images
Working with filters/layered nav.