Vedstatus reparert
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/core/Vedstatus.java
Vedstatus konflikt fikset
Merge branch 'master' of https://github.com/IT1901Gruppe15/IT1901Gruppe15