modified:   app/assets/images/store/2.jpg
Merge branch 'master' of https://github.com/jason0037/vt
	modified:   app/controllers/shop/goodsaddrs_controller.rb