Merge branch 'master' of https://github.com/skrogh/02102
maintenance
merge flict
add mandelbrot up to file reading
Merge branch 'master' of https://github.com/TheExplosiveSheep/02102
add mandelbrot zoom
fixed zooming