Merge remote-tracking branch 'origin/master'

pom.xml

src/main/java/Event.java

src/main/java/GeoShape.java

src/main/java/Main.java

src/main/java/Task5.java

src/main/java/Task7.java

src/main/java/Task9.java