rails demo
Merge branch 'master' of https://github.com/tuboc/rails_demo