Agregando cambios pequeños

Agregando cambios pequeños
Merge branch 'master' of https://github.com/n0dix/carrito

Conflicts:
	.gitignore