troll2
Merge branch 'test' of https://github.com/fleppo/Lab3 into test

Conflicts:
	bin/Line.class