Steiner
Steiner(nye filer)
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Spillet/Vikingvalg/Vikingvalg/CollisionManager.cs
	Spillet/Vikingvalg/Vikingvalg/ICanCollide.cs