ID Funcionandooo!
Merge branch 'master' of https://github.com/camposcristian90/reciclario

Conflicts:
	js/main.js