scala
Merge branch 'master' of https://github.com/shlax/Callie

Conflicts:
	callie-scala/.classpath
	callie-scala/.project
	callie-scala/src/org/callie/Main.scala
	callie-scala/src/org/callie/math/Matrix.scala
	callie-scala/src/org/callie/math/intr/Accl.scala
	callie-scala/src/org/callie/math/intr/Const.scala
	callie-scala/src/org/callie/math/intr/Intr.scala
Merge branch 'master' of https://github.com/shlax/Callie
.