first commit
Merge https://github.com/benjack/hello