edit
Merge branch 'master' of https://github.com/roninio/rubyonrails-blog