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