solved bullet
Merge branch 'weapon' of https://github.com/verath/ESCP into weapon