rebase continue
(fix) server/app.js
Merge pull request #69 from singalongwithme/master

rebase continue