commit
Merge branch '1120310707' of https://github.com/Sp4beans/HIT-news-Sp4beans into 1120310707
Merge pull request #7 from Sp4beans/1120310707

merge