2 team display

I get a null-pointer exception when setting up… still trying to figure
that out.  Take a look and see if you can figure it out if you want.  I
will continue later
Merge branch 'two-team-display'
Finished