ShipsTray preliminary
Merge branch 'demo' of https://github.com/Shipyards/Naval-Knockout into demo
Lots of work--Yay