Промежуточная
Правки
Merge Extra

Conflicts:
	.gitignore
	nbproject/genfiles.properties
	src/lines/Line.java
	src/triangles/Computer.java
	src/triangles/Polyangle.java
	src/triangles/Rectangle.java
	src/triangles/test/HTest.java
	src/triangles/test/Test.java
	src/vectors/TheVector.java
	src/vectors/TheVectorDistCompare.java
	test/triangles/PolyangleTest.java