All done but refactoring
  Merge branch 'master' of https://github.com/pvergel/blog_on_rails