reversed changes in karma.conf.js and server/app.js from prev commit