Merge WorkingSoftware/Sprint1

Conflicts:
	Brand og redning eksamens projek/src/GUI/Timeplan.java
Merge WorkingSoftware/Sprint1 into Sprint1