Weapons and UnitTests
Merge branch 'master' of ssh://github.com/maxstauss/gtr