Merge pull request #1 from pillade/master

pull
Se agrega paquete model y clase Nave
Default package eliminado.
Merge pull request #1 from mariano90/master

Pull