New file
boo boo edit - after a rebase
Changed after reading the rebase docs
something small and trivial
Merge branch 'master' of https://github.com/iangriggs/hellogit