More stuff
Finally
Merge branch 'master' of github.com:EnriqueB/SpaceshipArmada
Fixed some stuff