Added weapons
Added weapons
fixed merge conflicts