Add shopping cart
Add cart placeholder
Add cart content sample
Merge branch 'cart'
Add contact us page placeholder
Update readme
Merge branch 'contact'
Adding new contact information
Adding new logo to contact us page
Merge branch 'contact_us'

Conflicts:
	contact-us.html - we had a new logo and a new contact form and we just merged/included both
Bug fix
New design
Merge branch 'new_design'

Conflicts:
	index.html
Title change
Fix title
Initial jordan files
index on feature-j: ca6bb50 Initial jordan files
On feature-j: Home page title change
Merge branch 'feature-j'
Typo here