123
解决main.html和Resources的冲突
Merge pull request #3 from qianyu09/master

123