fix merge conflict
Merge pull request #28 from toannguyenle/rails

fix merge conflict