sincro
Merge branch 'master' of https://github.com/triploide/donde-reciclo

Conflicts:
	html/img/dummy/campaign.png