conflict
Merge branch 'master' of https://github.com/umass-cs-326/team-phrase-cards
Merge branch 'master' of https://github.com/umass-cs-326/team-phrase-cards
can search by player id now
added get by id