My desktop copy
removed the dublicate folder
Merge branch 'Magnus_Home_Commit'

Conflicts:
	ProjectGuard/Assets/Scripts/Traps/TrapDisarm.cs
	ProjectGuard/Assets/Scripts/Traps/TrapTrigger.cs
Traps are fixed (again) and door implementation
Merge branch 'master' of https://github.com/BjarkeHou/ProjectGuard

Conflicts:
	ProjectGuard/Assets/3Dmodels/Animations/Idle.anim
	ProjectGuard/Assets/AI/Actions/CalculateActionPriority.cs
	ProjectGuard/Assets/Scenes/CollisionFightingTest.unity