modified:   app/assets/stylesheets/shop.css
Merge branch 'master' of https://github.com/jason0037/vt