Merge branch 'JavaFX' of C:\Users\Jakob\workspace\DesApp with conflicts.
Merge remote-tracking branch 'origin/JavaFX' into JavaFX

Conflicts:
	src/Client/MainView.fxml
	src/Client/MainViewController.java
Jakob comments