merging
Merge branch 'master' of https://github.com/KevinStirling/Math-In-Motion

Conflicts:
	MathInMotion/Library/CurrentLayout.dwlt
	MathInMotion/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	MathInMotion/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	MathInMotion/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	MathInMotion/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	MathInMotion/Library/ScriptAssemblies/Assembly-UnityScript.dll
	MathInMotion/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	MathInMotion/Library/assetDatabase3
	MathInMotion/Library/shadercompiler-1.log
	MathInMotion/MathInMotion-csharp.sln
	MathInMotion/MathInMotion.sln