Finalizes cargo management

merges data files to goods; adds ships