-weapon delay now works
Merge branch 'master' of https://github.com/iboB/evoshooter

Conflicts:
	src/PlayerWeapon.cpp
asdf
Merge branch 'master' of https://github.com/iboB/evoshooter