modified:   app/assets/javascripts/store/tairyo_order.js
	modified:   app/controllers/manco_controller.rb
	modified:   app/controllers/patch/member_addrs_controller.rb
	modified:   app/controllers/store/cart_controller.rb
	modified:   app/controllers/store/goods_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/views/manco/blackbord.html.erb
	modified:   app/views/manco/find_manco.html.erb
	modified:   app/views/manco/main.html.erb
	new file:   app/views/manco/manco_comment.html.erb
	modified:   app/views/patch/member_addrs/_form_manco_first.html.erb
	modified:   app/views/patch/member_addrs/_form_manco_second.html.erb
	new file:   app/views/store/cart/manco_express.html.erb
	new file:   app/views/store/cart/mancoexpress_add.js.erb
	modified:   app/views/store/goods/find_manco_good_first.js.erb
	modified:   app/views/store/goods/mancoproduct.html.erb
	new file:   app/views/store/orders/arrival.html.erb
	new file:   app/views/store/orders/departure.html.erb
	modified:   app/views/store/orders/new_manco.html.erb
	new file:   app/views/store/orders/new_manco_addr.html.erb
	modified:   app/views/store/orders/ordersnew_manco.html.erb
	modified:   config/routes.rb
Merge branch 'master' of https://github.com/jason0037/vt
	modified:   app/controllers/manco_controller.rb
	modified:   app/views/manco/blackbord.html.erb
	new file:   app/views/manco/blackbord_add.html.erb
	modified:   app/views/manco/user.html.erb
Merge branch 'master' of https://github.com/jason0037/vt