Merge branch 'master' of github.com:osdakira/railstest
rails_sample