add weapon/Ship
Merge branch 'master' of https://github.com/Valtena/immunize-me