update from server@eng.local
update from server@cht.local
}
Merge branch 'cht.local' into cht
Merge branch 'eng.local' into cht.local

Conflicts:
	images/logo-w.jpg
首頁最新產品小圖加上alt和title
Merge branch 'eng.local' into cht.local
Merge branch 'cht.local' into cht