branch teste
Merge branch 'master' into carlos_branch
Merge branch 'master' of github.com:Didox/rails
commited by claudio
Merge branch 'master' into merge_conflito