<cambio2
Merge branch 'master' of https://github.com/seapaes/acorralados

Conflicts:
	.DS_Store
	bloc.txt