added a line
Merge branch 'master' of github.com:Maregrave/try_git