;jkdaf
Merge branch 'master' of https://github.com/os-robin/algebrator.git

Conflicts:
	CIRCLE/src/com/example/circle/EmilyView.java
Changed equation height.
Merge branch 'master' of https://github.com/os-robin/algebrator.git