Commit b5c037b5 authored by Georgii Aksenov's avatar Georgii Aksenov
Browse files

Merge branch 'iteration-02'

# Conflicts:
#	README.md
#	src/main/java/cz/muni/fi/pb162/project/Demo.java
#	src/main/java/cz/muni/fi/pb162/project/geometry/Vertex2D.java
#	src/test/java/cz/muni/fi/pb162/project/demo/DemoTest.java
#	src/test/java/cz/muni/fi/pb162/project/geometry/Vertex2DTest.java
parents fa8b20df 2bc653f9
Pipeline #71794 passed with stage
in 10 seconds