New file
Cart placeholder
Second change to shopping cart
Merge branch 'cart'
New contact us file
Updated readme
Merge branch 'contact'
Adding new contact information
Adding new logo to contact us page
Merge branch 'contact_us'

Conflicts:
	contact-us.html - here is the reason
New design
Other changes
Merge branch 'new_design'

Conflicts:
	index.html
New stuff
No Typo here
Changed home page
added new link feature
Add new pages and styles
Revert "Add new pages and styles"

This reverts commit 9d4a41b1b6e45931f19c3146a2d97fd0d0fa6811.