minor tweaks.  may conflict with work done at home
trouble merging.  delete and re add?
Merge branch 'master' of https://github.com/Mr-What/kossel

Conflicts:
	wheeledCarriage.scad
did manual merge.  did not sucessfully merge, so delete and re-add