rails app
Merge branch 'master' of github.com:dtting/aixin