added Player, Game and Board classes
Fixing some merge issues