a

h
f

ff
Merge branch 'master' of https://github.com/dgandrem/Inventario

Conflicts:
	.DS_Store