primeiras modificacoes
Merge branch 'master' of https://github.com/italolins/hackfest2