jahapp
Merge branch 'master' of https://github.com/Blinke/Planspelet

Conflicts:
	Planspelet/GameManager.cs
	Planspelet/Player.cs