Added all the new files mang.
Resolved conflict in header.php
Added a shopping cart icon
Added a shopping cart image
Finished header