Changes with respect to contest page
Checking in integrated code

Conflicts:
	app.js
	routes/user.js
Merging user.js

Conflicts:
	routes/user.js