can't register yet
adding everything
Merge pull request #12 from MiguelABarbosa/miguel

adding everything
pulled Miguel copy and solved merge conflicts