DX text
Text
Merge branch 'Erik' into Windows

Conflicts:
	Breakout/Breakout/Breakout.vcxproj.filters
	Breakout/Breakout/Graphics/GraphicsManager.cpp
	Breakout/Breakout/Graphics/GraphicsManager.h
	Breakout/Breakout/Graphics/IGraphics.h
	Breakout/Breakout/Scenes/GameScene.cpp
Text