updating on test1 branch
changed on master
merging in changes from test1
a new change on master
a new change on test2 branch
Merge branch from 'test2'
adding test.c to repo
added some debug code
fixing minor bug found by QA
testing
new master change
A new change on foobar
Merging changes from master
Merge remote-tracking branch 'origin/master'