Made changes to playerInfo and game to count isAlive and cleaned up
resolved merge conflict
changed isAlive()
merging
resolved conflict
added json tags