Merge origin/master

Conflicts:
	build/classes/grapher/ui/Grapher.class
	build/classes/grapher/ui/Main.class
	build/jar/Grapher.jar
	src/grapher/fc/Function.java
	src/grapher/fc/FunctionFactory.java
	src/grapher/fc/Test.java
	src/grapher/ui/Grapher.java
	src/grapher/ui/LeftPane.java
	src/grapher/ui/Main.java