test change from branchFromPlayground
Merge branch 'branchFromPlayground' of https://github.com/nbrake/mathworksTest

Conflicts:
	tests/linearTest.m

resolved conflicts using branchFromPlayground first