Add .DS_Store to .gitignore
Merge remote-tracking branch 'upstream/master' into remove_emptycart
Bind cart to session in recalculate_cart