Merge pull request #194 from nishedcob/master

actualizar rama jose luis
Merge pull request #201 from nishedcob/master

actualizar jose luis
Merge pull request #203 from nishedcob/master

Merge pull request #199 from nishedcob/nishedcob-nyx
Create Interfaz1.java

Contribucion de Jose Luis
Create Interfaz2.java

Contribucion de Jose Luis ( @joseDG )
Create Interfaz1.form

Contibucion de Jose Luis ( @joseDG )
Create Interfaz2.form

Contribucion de Jose Luis ( @joseDG )
Merge pull request #205 from nishedcob/jose-luis

Contribucion de Jose luis
Anadir Iconos (Imagenes)
Implimentando Menu Principal
Implimentando Menu Principal
Merge pull request #206 from nishedcob/nishedcob-nyx

Nishedcob nyx
Merge pull request #208 from nishedcob/master

actualizar rama andrea