added weapon
quickfix of health
small fixes
Merge pull request #24 from IngvarJackal/develop

added weapon