Malon2 adicionei
Merge branch 'master' into Marlon2
Merge branch 'master' of https://github.com/Didox/rails