loool
.h
Merge branch 'master' of https://github.com/adeadrat/GameJam13 into sebastian

Conflicts:
	silence/silence.suo
hej allihopapap
dasdw
Merge branch 'master' of https://github.com/adeadrat/GameJam13

Conflicts:
	silence/silence/silence.vcxproj
	silence/silence/silence.vcxproj.filters
Camera
camera
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
Merge branch 'sean'

Conflicts:
	silence/silence.sdf
	silence/silence.suo
fix
Merge branch 'sebastian'

Conflicts:
	silence/silence.sdf
	silence/silence.suo
	silence/silence/silence.vcxproj
	silence/silence/silence.vcxproj.filters
ResourceManager
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
fix
sean hejd
kalle
Merge branch 'master' of https://github.com/adeadrat/GameJam13

Conflicts:
	silence/silence.sdf