change of linear parameters
llala
box ....
Merge branch 'master' of https://github.com/ticklesmum/fractal

Conflicts:
	box_disp.pyc