modified:   app/assets/stylesheets/store/cats.css.scss
Merge branch 'cheuks' of https://github.com/jason0037/vt into cheuks

Conflicts:
	app/views/store/goods/_new_single.html.erb