test commit to playground after successful modification of master within the mathworks environment
Merge branch 'playground' of https://github.com/nbrake/mathworksTest into playground

Conflicts:
	tests/linearTest.m
merged after conflict between two different modifications from separate repositories