Marinetype and nuketype created
Merge branch 'master' of https://github.com/wilbefast/TAW-ld27