Merge branch 'master' of /Users/Jay/AndroidStudioProjects/VolleyGameRecord with conflicts.
Merge remote-tracking branch 'origin/master'
Team2_Editing

can add new player