fixar
Merge branch 'Jimmy'

Conflicts:
	silence/silence/Frog.cpp
	silence/silence/Game.cpp
	silence/silence/Game.h
	silence/silence/Knuckles.cpp
	silence/silence/SpineMace.cpp