Handle merging shapes (I hope? I think...)
Merge branch 'master' of github.com:jeffwheeler/scan2present