test1
Merge branch 'master' of github.com:ljlong/test

Conflicts:
	TestGitHub/AppDelegate.h