roughly done
Merge branch 'master' of https://github.com/hisashin/NinjaLock.git

Conflicts:
	cad/Assemble.dwg