rails from xiongbo
Merge branch 'master' of github.com:bay6/railscasts