arquivo para merge
commited by claudio
Merge branch 'master' into merge_conflito