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
aa
aa
aa
Merge branch 'Jimmy'
a
fix
animation
map
massa �ndringar.. ehehe lycka till
Merge branch 'Jimmy'

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