list movies, view users
view history
Update User
Update User
Merge branch 'master' of
https://github.com/varunme15/VideoLibraryManagement.git

Conflicts:
	DatabaseConnections/OrderDao.js
	DatabaseConnections/UserDao.js
	Model/Order.js
	Model/User.js
	app.js
	routes/index.js