merge forked file addition into main project

[JimOrtiz]

The catalog isn't complete yet, but figured it'd be good to find out if the mercenaries can still be programmatically added, or if I've got some ID remapping to do.