changing tabs to 4 spaces in wip.json
Fix failed merge
Merge branch 'fail_merge_hullclass'
Allow ship size to be more finely grained