mongo testing
debug
Merge branch 'dev' of https://github.com/Yahkob/quickcall-server into dev

Conflicts:
	server.js
mongo testing
mongoose debugging
added login/signup method integrated into google.js
Merge branch 'dev' of https://github.com/Yahkob/quickcall-server into dev

Conflicts:
	config/passport/google.js
	server.js
Merge branch 'dev' of https://github.com/quickcall/quickcall-server into dev

Conflicts:
	utility/passport-google.js
fixed merge conflict
Merge pull request #11 from Yahkob/dev

added login and signup method
modularized the plivo call methods to call.js
merge conflict on passport-google resolved
merge resolved
changed packaged.json
redacted dev and test configs