updated app.js and game.js
merging
merging