japp
Merge branch 'master' of https://github.com/McNice/Projekt1

Conflicts:
	Game/Game/Game/Manager.cs