Merge pull request #2 from musef/master

esto es pa borrar
Commit despues de Maven
Merge pull request #3 from fmsmusef/master

Incorporar esta modificación después de implementar Maven
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/fmsconta/control/ContaDAO.java
	src/main/java/fmsconta/control/Fmsconta1.java
	src/main/java/fmsconta/view/ContEmpresa.java
	src/main/java/fmsconta/view/Identificacion.java
	src/main/java/fmsconta/view/PantallaPrincipal.java
	src/main/java/fmsconta/view/Presentacion.java