add shopping cart
modify shopping
add contact.html
modify readme
Merge branch 'contact'
add conflict
cinflict
note
add a few new pages