Updated server.js adding OAuth
updated package for dependencies
Merge branch 'master' into OAuth
Adding twitter OAuth
pg version
merge