other
Merge branch 'master' of https://github.com/jokercvbs/GitHubTestUse

resolve Conflicts:
	GitHubProject/ViewController.m