other dev, adding file
Merge branch 'master' of http://github.com/jonathanmastin/try_git
other dev adding swimming file
Merge branch 'master' of https://github.com/jonathanmastin/try_git
Merge remote-tracking branch 'origin/master' into swimming