RM20 8
Merge branch 'master' of https://github.com/jesper1610/gruppe13_del1.git

Conflicts:
	13_02324_F13/D2/Controller.java
	13_02324_F13/build/classes/Controller$PhysicalScaleSim.class
	13_02324_F13/build/classes/Controller.class
	13_02324_F13/build/classes/Vaegt.class
	13_02324_F13/build/classes/controller/AdminController.class
	13_02324_F13/build/classes/controller/MenuController.class
	13_02324_F13/build/classes/function/PasswordGenerator.class
	13_02324_F13/build/classes/userInterface/Menu.class