initial checkin
can now associate uids with players
Merge branch 'players'