My exciting new file
Merge branch 'master' of github.com:timlinux/inasafe-git-training
Merge branch 'master' of github.com:timlinux/inasafe-git-training