working
Merge https://github.com/thenderson/homework