cambioPrueba
prueba
Merge branch 'master' of https://github.com/jhossmar/simulacion.git

Conflicts:
	src/com/umss/fcyt/vista/VentanaPrincipal.java
reportes