commit for merge and pull
Merge branch 'master' of https://github.com/KevinStirling/Math-In-Motion

Conflicts:
	MathInMotion/Assembly-CSharp-vs.csproj
	MathInMotion/Assembly-CSharp.csproj
	MathInMotion/Assets/Sprites.meta~HEAD.meta
	MathInMotion/Library/CurrentLayout.dwlt
	MathInMotion/Library/assetDatabase3
	MathInMotion/Library/guidmapper
	MathInMotion/MathInMotion-csharp.sln
	MathInMotion/MathInMotion.sln