Ed did not type this
Merge branch 'master' of https://github.com/marcelvanhove/try_git