Småfiks
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Spillet/Vikingvalg/Vikingvalg/InGameManager.cs
	Spillet/Vikingvalg/Vikingvalg/SpriteManager.cs