Finished adding Weapons
Merge branch 'Weapons'