This git conflict thing is hard.
This git conflict thing is hard.

I updated the script to load ships into the DB. So rerun that. As I mentioned,
'max_fuel' and 'max_bull' will be considered base stats, so I reflected that
in the scripts. The other conflicts were mostly identiation mismatchs, so it's ok.

KanColleTool/kcsrv,KanColleTool/kcsrv,KanColleTool/kcsrv