Add 1a, modify 1
Modify file 1
Add a second file
Second file modified
Modify file 2 again
Merge branch 'feature.addSecondFile' of github.com:exo/git-workflow into feature.addSecondFile