mix funciones.js

No va mas.
Merge branch 'master' of https://github.com/raulinoamaral/dm

Conflicts:
	public/js/funciones.js