Model reworked a bit
Merge branch 'master' of github.com:RobertBorg/SE-LTH-EDA216

Conflicts:
	Project/KrustyKookies/src/controller/ProductionController.java