First Shader Implementation test
Merge remote-tracking branch 'remotes/origin/steven' into steven

* remotes/origin/steven:
  Even More Cleanup
  Cleanup

Conflicts:
	C#/Game.cs
	C#/Graphics/GraphicsManager.cs
	C++/GraphicsManager.cpp
	C++/GraphicsManager.h
	C++/stdafx.h
Fixed some merge issues
First pass of working shaders