edit
Merge branch 'master' of github.com:anschang/ruby-on-rails-practice