Committed with test view controller 2
Merge remote-tracking branch 'origin/testBranch'

Conflicts:
	TestRepository/TestRepository.xcodeproj/project.pbxproj