current updates of making shipping
done with shipping
Merge branch 'new_site_old_js'
updating menu