Edit .gitignore
Merge branch 'master' of https://github.com/lsqshr/NAMIC-CAD-Toolbox

Conflicts:
	.gitignore
Merge into Eclipse Sidong