.
Merge branch 'master' of https://github.com/xuqiyong0208/syh2014_ruby