update ring.scad
Merge branch 'origin/master'

Conflicts:
	rings/ring.scad