Prepare to merge with nate.
Merge remote-tracking branch 'origin/master' into steve
Add player and add team functionality.