script ændret

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/database/DatabaseAccess.class
	16_CDIOFinal/src/database/DatabaseAccess.java
sql-script virker

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