Merge branch 'master' of D:\Study\NodeJS\GanXa2 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/search.ejs
Sửa search