cambios en la administración
Merge branch 'master' of https://github.com/stilexmagic/alto-piacere

Conflicts:
	images/.DS_Store