changing staff
making staff set more flexible
removing yonin bs
adding another combatweapon
Merge branch 'master' of github.com:AlanWarren/gearswap