Pushing geometry changes
Merge branch 'master' of github.com:rfahsel3/gpu