Fixed header shopping cart icon.
Merge branch 'master' of https://github.com/veronicacannon/git_merge
Merged two versions of base with non-conflicting edits.