Committed after creating the view.
Committed after creating the custom view.
Merge remote-tracking branch 'origin/branch2'

Conflicts:
	GitTest/GitTest.xcodeproj/project.pbxproj