small changes
Merge branch 'master' of https://github.com/rfahsel3/gpu

Conflicts:
	geometry.v
Merge branch 'master' of https://github.com/rfahsel3/gpu