商家確認修改資料的按鈕顏色
Merge branch 'master' of github.com:cecj06googo/Googo
demo用圖片放入img資料夾下的demoPoducts (圖片名稱未改)
圖片
Merge branch 'master' of github.com:cecj06googo/Googo

Conflicts:
	WebContent/img/demoCars/GJ1-1.jpg
	WebContent/img/demoCars/GJ1-2.jpg
	WebContent/img/demoCars/GJ1-3.jpg
	WebContent/img/demoCars/GJ1-4.jpg