page2 integration initial

To do json fills in jade
Merge branch 'master' of https://github.com/nishanths/travel-app

Conflicts:
	db.js
	routes/index.js
	views/login.jade