Merged or somthing like that
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/view/partials/ItemsController.java
	src/view/partials/ItemsPartial.fxml
	src/view/partials/itemPartials/BasicGoodsPartial.fxml