Trap disarm - GUI label virker ikke ordentligt, den har ingen tekst..
Merge branch 'master' of https://github.com/BjarkeHou/ProjectGuard

Conflicts:
	ProjectGuard/Assets/Scripts/Controllers/AttackController.cs
	ProjectGuard/Assets/Scripts/Controllers/GameController.cs