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

Conflicts:
	silence/silence/Player.cpp
	silence/silence/Player.h