first commit
Merge https://github.com/mjmcconnell/gittest