Handle edge effects
Merge branch 'master' of github.com:mmcfarland/canvas-renderings

Conflicts:
	elemental-ca.js