change in algorithm
fixed merging conflicts...
erge branch 'master' of https://github.com/ticklesmum/fractal

Conflicts:
	Parameters.cpp
	Parameters.h
	main.cpp
	test.cpp