stuff uhhh what did i do?
Merge remote-tracking branch 'origin/master'

Conflicts:
	CIRCLE/src/com/algebrator/eq/MultiEquation.java
more Eq work
Merge branch 'master' of https://github.com/os-robin/algebrator.git

Conflicts:
	CIRCLE/src/com/algebrator/eq/MultiEquation.java
	CIRCLE/src/com/algebrator/eq/NumConstEquation.java