不知道 9c59184db67fac3339177527270db2f34890d2f2 怎麼搞出 conflict?!

Conflicts:
	2013/events/nokia-microsoft-wp-contest_v2.html
conflict conflict...

Conflicts:
	2013/events/nokia-microsoft-wp-contest_v2.html
把 MSFT event 新規則先上
加入 google analytics code 到 WP contest 頁面
加入 acomo & appuniverz logo
Merge branch 'develop' into release/2013
加入 moregeek & hiiir logo
Merge branch 'develop' into release/2013
改改改
Merge branch 'develop' into release/2013
Merge branch 'develop' into release/2013
依據贊助商需求調整 logo
Merge branch 'develop' into release/2013
Merge branch 'develop' into release/2013
Merge branch 'develop' into release/2013
Merge branch 'develop' into release/2013
加入春水堂 logo
Merge branch 'develop' into release/2013
Merge branch 'refs/heads/develop' into release/2013
依據贊助商需求修正 wording