Merge branch 'master' of

Conflicts:
gradients.sh
edit conflict
Merge branch 'master'

Conflicts:
	gradients.sh