.idea/ added to .gitignore for the use of PHPStorm.
Daily activities updated.
Merge pull request #7 from JeldorPKU/master

Daily activities updated.
Merge pull request #8 from ckcz123/master

解决main.js的一个问题：进站图如果原图过大将出现卡死状况
Merge remote-tracking branch 'upstream/master'