adapter now uses Player object
clean up
clean up
clean up
Merge branch 'master' of https://github.com/mcorbridge/FirebaseTest
clean up