armor hit rate
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assets/Shooter/Scripts/Gun.js
	shooter/Assets/Shooter/Scripts/Weapon/Bullet.js
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper