modified:   app/views/layouts/manco.html.erb
	modified:   app/views/manco/history.html.erb
	modified:   app/views/store/cart/index.html.erb
	modified:   app/views/vshop/goods.html.erb
	modified:   app/controllers/store/cart_controller.rb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	app/controllers/store/cart_controller.rb
	modified:   app/views/manco/blackbord.html.erb
	modified:   app/views/store/orders/manco_card.html.erb
	modified:   app/views/manco/blackbord.html.erb
	modified:   app/controllers/pages_controller.rb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	app/controllers/store/cart_controller.rb