Add Jerky, fix Drying Rack
Fix merge conflicts