modified:   app/controllers/store/cart_controller.rb
	modified:   app/controllers/store/goods_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/views/store/cart/jinbalang.html.erb
	new file:   app/views/store/cart/show_tairyo.html.erb
	new file:   app/views/store/goods/tairyoall.html.erb
	modified:   app/views/store/orders/tairyo_order.html.erb
	modified:   app/views/tairyo/index.html.erb
	new file:   app/views/tairyo/showorder.html.erb
	modified:   config/routes.rb
Merge branch 'master' of https://github.com/jason0037/vt
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/views/store/goods/mproduct.html.erb
	new file:   app/views/store/orders/norsh_show_order.html.erb
	modified:   app/views/vshop/user.html.erb
	modified:   config.ru