animation
Merge branch 'Jimmy'

Conflicts:
	silence/silence/Player.cpp