666
Merge branch 'master' of ssh://git@github.com/plagas-erp/testing5.git

Conflicts:
	testing5/src/main/java/testing5/OtraClase.java