Mac Derp
ent
Merge branch 'master' of https://github.com/adeadrat/GameJam13

Conflicts:
	silence/silence.suo
	silence/silence/Entity.h