Signed-off-by: Emil hein <Emil@10.16.99.142>
Merge branch 'master' of https://github.com/emilhein/16_CDIOFinal.git

Conflicts:
	16_CDIOFinal/build/classes/database/DatabaseAccess.class

Signed-off-by: Emil hein <Emil@10.16.99.142>
Merge branch 'master' of https://github.com/emilhein/16_CDIOFinal.git
Merge branch 'master' of https://github.com/emilhein/16_CDIOFinal.git


Signed-off-by: Emil hein <Emil@Emil-Pc>
Merge branch 'master' of https://github.com/emilhein/16_CDIOFinal.git

Conflicts:
	16_CDIOFinal/build/classes/Main.class
	16_CDIOFinal/build/classes/controller/ASE$Weight.class
	16_CDIOFinal/build/classes/controller/ASE.class
	16_CDIOFinal/build/classes/controller/Boundary.class
	16_CDIOFinal/build/classes/controller/Simulator.class

Signed-off-by: Emil hein <Emil@Emil-Pc>