local commit that should conflict with origin
Merge remote-tracking branch 'origin/master'

Conflicts Resolved:
	TestProj2_DVCS/GLYFirstViewController.m