commit1
commit1
creado catalogo store
creado catalogo store
commit 1 gestv
Merge branch 'master' of https://github.com/jpamaya/depot

Conflicts:
	.gitignore
	.idea/depot.iml
	.idea/scopes/scope_settings.xml
	.idea/workspace.xml
	config/routes.rb
	db/schema.rb