shopping cart
contact page
more changes
added links
added shopping cart content
Merge branch 'cart'
Merge branch 'contact'
change one
change two
Merge branch 'contact_us'

Conflicts:
	contact.html
Typo here
new pages together
Merge branch 'master' of https://github.com/mcjffld/pl-sample-1
sun and sky