Fixed deprecated stuff
Merge resolved
removed comment
Merge branch 'master' of https://github.com/Shipyards/Naval-Knockout
Builds
Runs
Merge branch 'master' into local
Merge branch 'master' of https://github.com/Shipyards/Naval-Knockout
Merge branch 'master' into local