made weapon class
Merge remote-tracking branch 'coady/master'
stuff
Merge remote-tracking branch 'coady/master'