MAC DERP
Merge branch 'linder'

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