game.js merging conflict
added character object, sound file