added code to display name and description of characters
fixed merge conflict in choosePlayer.html