speculatin' on Composer
hrm
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/code/~temp/x64/Debug/render/DisplayDx11.obj
	source/code/~temp/x64/Debug/render/RendererDx11.obj
	source/code/~temp/x64/Debug/render/TargetSetDx11.obj
	source/code/~temp/x64/Debug/render/TextureDx11.obj