Commit revisiones tienda
commit gitignore
Merge branch 'master' of github.com:alvarotarquiola/tienda

Conflicts:
	.gitignore
	admin21/index.php
	admin21/tabs/AdminCatalog.php