Camera/Entity
entity
Merge branch 'master' of https://github.com/adeadrat/GameJam13

Conflicts:
	silence/silence.sdf
	silence/silence.suo
	silence/silence/silence.vcxproj
	silence/silence/silence.vcxproj.filters