Added weapons.
Merge branch 'Weapon'