index.php重複檔案修正
[main.css] 重複修
[tab CC to Quo]排版
Merge commit 'c01cb795b13994b153bde9a9d77d58fa879a3942' into develop

Conflicts:
	mynewtemplate/css/main.css
	mynewtemplate/index.php
fix conflict
comments count