trouble getting Karma to remain running, changed setting in Gruntfile.js, add dist back into .gitignore, server/app.js back to development
karma related changes to Gruntfile.js, karma.config.js, server/app.js
reversed changes in karma.conf.js and server/app.js from prev commit
Merge pull request #36 from lizlongnc/dev_liz

deleted dist files continue to appear in pull request