hahaha
Merge branch 'master' of https://github.com/icylydia/zhaohua
Merge pull request #35 from ChinaPicture/master

hahaha