added weapon class
refactored
more minor refactoring
Merge branch 'master' of https://github.com/slofurno/warlocksr.git