fix lista
fix conflict
Merge branch 'master' of https://github.com/triploide/donde-reciclo

Conflicts:
	html/js/large.js