diff --git a/hw2/.idea/.gitignore b/hw2/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/hw2/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/hw2/.idea/hw2.iml b/hw2/.idea/hw2.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/hw2/.idea/hw2.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hw2/.idea/modules.xml b/hw2/.idea/modules.xml
new file mode 100644
index 0000000..b3c4100
--- /dev/null
+++ b/hw2/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hw2/.idea/vcs.xml b/hw2/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/hw2/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hw3/code/Assignment3.iml b/hw3/code/Assignment3.iml
new file mode 100644
index 0000000..1f742ef
--- /dev/null
+++ b/hw3/code/Assignment3.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hw3/code/src/main/java/ch/usi/inf/ajp22/Album.java b/hw3/code/src/main/java/ch/usi/inf/ajp22/Album.java
index 809bb9e..6da28a6 100644
--- a/hw3/code/src/main/java/ch/usi/inf/ajp22/Album.java
+++ b/hw3/code/src/main/java/ch/usi/inf/ajp22/Album.java
@@ -3,6 +3,7 @@ package ch.usi.inf.ajp22;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
+import java.util.stream.Collectors;
public class Album {
@@ -44,19 +45,30 @@ public class Album {
/**
* 3 Points
- * TODO: create a public Optional