is this working?
Merge https://github.com/killdozer87/exercise2