user modeled
Merge branch 'master' of https://github.com/zhouyuchen/test_rails