commit
Merge branch 'master' of https://github.com/shasha-chen/moviestore
Merge branch 'master' of https://github.com/shasha-chen/moviestore
Merge branch 'master' of https://github.com/shasha-chen/moviestore

Conflicts:
	app/routes-mysql.js
commit
Merge branch 'master' of https://github.com/shasha-chen/moviestore
UI
Merge branch 'master' of https://github.com/shasha-chen/moviestore

Conflicts:
	views/issueMovie.ejs
	views/searchMovie.ejs
Merge branch 'master' of https://github.com/shasha-chen/moviestore

Conflicts:
	app/routes-mysql.js