Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into daniel

# Conflicts:
#	src/main/java/com/faf223/expensetrackerfaf/controllers/MainController.java
#	src/main/resources/application.properties

pom.xml

@@ -36,6 +36,18 @@
             <scope>test</scope>
             <version>3.1.2</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-jpa -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <version>3.1.3</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc -->
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>12.4.1.jre11</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>