modified:   app/controllers/shop/shopinfos_controller.rb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	app/controllers/shop/shopinfos_controller.rb

	modified:   app/.DS_Store
	modified:   app/controllers/.DS_Store
	modified:   app/controllers/shop/shopinfos_controller.rb