20130212
Merge branch 'master' of github.com:luohaoyuan/luohaoyuan.github.com