fk Sean
Merge branch 'master' of https://github.com/PutBoy/GameJam-2013

Conflicts:
	silence/silence/Player.cpp
	silence/silence/Player.h
fix
Merge branch 'Jimmy'

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