new
h
Merge branch 'master' of https://github.com/nongdenchet/Test-Git

Conflicts:
	Test Git/CCViewController.m
a