Weapon
Merge branch 'develop' of https://github.com/lragnarsson/Strike into develop