test
Merge branch 'master' of https://github.com/youthcode/HelloGit

Conflicts:
	HelloGit/HGAppDelegate.m