Alterei o design de algumas classes
Merge pull request #17 from MayaraAmanda/master

pegando