new fractal update
Merge branch 'fractal'

Conflicts:
	BashFile