Joe added a Weapons class
Merge origin/master