Merge pull request #1 from huxiangtao/2014-3-21

2014 3 21
Merge branch 'master' of github.com:huxiangtao/GreenValley
adjust liquid
de jpg