add bar
add qux
Merge branch 'new-branch' of github.com:satterly/test-repo into new-branch