changes on main
Merge branch 'master' of https://github.com/DanielBoerlage/Implicit-Plotter

Conflicts:
	src/implicitplot/Main.java