issue06 change1
issue06 change2
issue06 change1
issue06 change2
issue07 change1
issue07 change2
issue07 change3
fix conflict
Merge remote-tracking branch 'origin/wip/bradtm2000/test' into
wip/bradtm2000/test

Conflicts:
	a.txt
issue08 change1
issue08 change2
issue08 change3
updated on client
Merge branch 'wip/bradtm2000/test'

Conflicts:
	c.txt