Merge branch 'internationalization'
Merge branch 'master' of github.com:coding-chimp/little-rails-blog