added team names fixed some bugs
merged base
Merge pull request #70 from ppicinic/base.teamname2

added team names fixed some bugs