basic database setup
Merge branch 'master' of https://github.com/nishanths/travel-app

Conflicts:
	travel-app/app.js
	travel-app/package.json