Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template

SourceTree needed to merge this?

src/Client/src/main/resources/fxml/dashboard.fxml

@@ -216,3 +216,4 @@
       </AnchorPane>
    </children>
 </AnchorPane>
+

src/Server/src/main/java/greenify/server/rest/UserController.java

@@ -1,11 +1,11 @@
 package greenify.server.rest;
 
 import greenify.common.UserDto;
+import greenify.server.data.model.User;
+import greenify.server.data.repository.UserRepository;
 import greenify.server.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 //class that controls the user with regards to the server and sending data between them
 //this class kind of 'redirects' the requests from the client to the server

src/Server/src/test/java/ApplicationTest.java

@@ -10,3 +10,4 @@ public class ApplicationTest {
     @Test
     public void contextLoads() throws Exception{ }
 }
+