刪除alert
Merge branch 'master' into SearchModule
搜尋資料
Merge branch 'master' into SearchModule

Conflicts:
	scripts/app.js