Merge pull request #1 from pweisenburger/master

Merge
Merge pull request #2 from pweisenburger/master

Own player added to Game
Merge remote-tracking branch 'origin/master'