player!
player
Merge branch 'Jimmy'

Conflicts:
	silence/silence/Player.cpp
Merge branch 'master' of https://github.com/PutBoy/GameJam-2013
MapGeneration
Merge branch 'master' into sebastian
Merge branch 'sean'
map
Merge branch 'master' into sebastian
:(
MAC DERP
more animations in player
aa
Merge branch 'Jimmy'
Merge branch 'linder'

Conflicts:
	silence/silence/Entity.cpp
	silence/silence/Entity.h
	silence/silence/EntityManager.h
fix
Merge branch 'master' of https://github.com/PutBoy/GameJam-2013
Merge branch 'master' of https://github.com/PutBoy/GameJam-2013