RailsCastsBrasil/RailsCastsBrasil — pull request #17 by plribeiro3000 (2014-06-11 04:25:31+00:00)
Title: Fixed merge conflicts

* Fixed merge conflicts on Gemfile