adding everything
Merge pull request #12 from MiguelABarbosa/miguel

adding everything