made game.jade functional
merging