證書更新
證書更新
before merge
after merge
'140514 更新我要訂購連結 更新獨家技術圖
影片更新
Merge branch 'master' of https://github.com/SummersAdvertising/rungteng

Conflicts:
	app/views/staticpage/about.html.erb
	public/images/tn-03.png
	public/images/tn-04.png
merge about