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

Conflicts:
	MathInMotion/Library/CurrentLayout.dwlt
	MathInMotion/Library/guidmapper