added team class and player input of number of teams
Merge origin/master