Committed after creating the view controller.
Committed after linking the third view with others.
Merge remote-tracking branch 'origin/branch1'

Conflicts:
	GitTest/GitTest.xcodeproj/project.pbxproj