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

Conflicts:
	app/routes-mysql.js