some changes
some changes
some changes
some changes
stuff
Merge branch 'master' of https://github.com/rnikolaus/FractalGenerator

Conflicts:
	target/FractalGenerator-1.0-SNAPSHOT-jar-with-dependencies.jar
	target/FractalGenerator-1.0-SNAPSHOT.jar