Prueba 2

SI si
Merge branch 'master' of https://github.com/gdeioannes/multiploc

Conflicts:
	js/multiploc4.js