Mostly finished with board, fixed merge error in player.js file[B