Added new weapons.
Merge