Fixed delta collision bugs
fixed merge conflicts with delta collision bug
Added guns to loading assets