commiting what i have
Merge remote-tracking branch 'origin/master'

Conflicts:
	KB-06/Racer/resources/shaders/TextShader.fx