2nd commit from backlift
fix conflicts
resolved conflict
started update team scores form
odd team schedule now working