adding gamemaster
Merge branch 'master' of ssh://github.com/straemer/PowerGrid
Merge branch 'master' of ssh://github.com/straemer/PowerGrid

Conflicts:
	src/gamemaster/player.py
Merge branch 'master' of ssh://github.com/straemer/PowerGrid
Merge branch 'master' of ssh://github.com/straemer/PowerGrid