this better work
Merge remote-tracking branch 'origin/eirik'

Conflicts:
	Cabin/cabinController.java
	application/MainApp.java
	application/MainController.java
	src/fxml/Tabs.fxml