RcsMatrix added
Merge branch 'master' of https://github.com/stockton42/taomcp

Conflicts:
	MultTest.java