Branching test
Before Merging commit
Merge branch 'master2'

Conflicts:
	Quartz
Drawings.xcodeproj/project.xcworkspace/xcuserdata/Tim.xcuserdatad/UserIn
terfaceState.xcuserstate
Changed Work View's bounds
Merge branch 'update-branch'
123
1234
12
Merge branch 'update-branch'

Conflicts:
	Quartz
Drawings.xcodeproj/project.xcworkspace/xcuserdata/Tim.xcuserdatad/UserIn
terfaceState.xcuserstate
before merging conflict commit
before merging conflict commit 2
Merge branch 'update-branch'

Conflicts:
	Quartz
Drawings.xcodeproj/project.xcworkspace/xcuserdata/Tim.xcuserdatad/UserIn
terfaceState.xcuserstate
666
777
Merge branch 'updade-branch'
added new image, changed old image
Merge branch 'graphics-branch'
master update
added a new image
Merge branch 'graphics-branch'

Conflicts:
	Quartz Drawings/AppDelegate.m