bug fixed.
Merge branch 'master' of github.com:manyunkai/dannysite.com