commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	2.GeometricShapes/.ntvs_analysis.dat