make change
Merge branch 'master' of https://github.com/hakfong/TestSource

Conflicts:
	TestGit/TestGit/ViewController.m