Initial commit
Merge https://github.com/jonathanagosto/homework1