muh maven
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	src/Actors/Carriage.java
	src/Actors/Costumer.java
	src/Actors/Employee.java
	src/Actors/NewDutchCostumer.java
	src/Actors/NonBinaryGenderCostumer.java
	src/Actors/StudentCostumer.java
	src/Actors/TaskManager.java
	src/Controllers/MainController.java
	src/Graphics/MainWindow.java
	src/Interfaces/Actor.java
	src/Interfaces/Buyzone.java
	src/Interfaces/Task.java
	src/Main.java
	src/Models/Aisle.java
	src/Models/CashRegister.java
	src/Models/Department.java
	src/Models/DiscountAisle.java
	src/Models/Product.java
	src/Models/Route.java
	src/Models/Shelf.java
	src/Models/Storage.java
	src/Supermarket/Database.java
	src/Supermarket/Options.java
	src/Supermarket/Supermarket.java