Adicionado os arquivos
Merge branch 'master' of https://github.com/WickedPeanuts/TestingConflito