conflict fix
Merge branch 'master'

Conflicts:
	gradients.sh