resolving conflict for merge
Merge branch 'master' of https://github.com/KevinStirling/Math-In-Motion

Conflicts:
	MathInMotion/Library/shadercompiler-1.log