state fix
Merge branch 'sean'

Conflicts:
	silence/silence/Entity.cpp
filer
Merge branch 'Jimmy'

Conflicts:
	silence/silence/Player.cpp
Merge branch 'master' of https://github.com/PutBoy/GameJam-2013