Added Map attribute to Game and random generator to Player starting position
Merge origin/master
Merge origin/master