app.js and db.js updated
Changed the app.js and db.js so that it return back to app.js instead of going forwarding the data straight to the client
Merge remote-tracking branch 'upstream/master'
Merge pull request #17 from ssj3sunny/master

Fixed App.js and Db.js