category - shop

category - shop
push

push
public

public
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb