player anims
Merge branch 'master' of https://github.com/iboB/evoshooter

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

Conflicts:
	src/ExperimentState.cpp
	src/MainCharacter.cpp
player weapons