merge from heroku
merge successfully
commit before merge 6/28
resolve merge conflict
Change main page nav-section; add product_list
add shopping bag design; pagination design