不知道做了什么修改。
NSLog in ViewController
Merge branch 'master' into FirstBranch

Conflicts:
	Git-Demo.xcworkspace/xcuserdata/wangqibin.xcuserdatad/UserInterfaceState.xcuserstate
Merge pull request #1 from AdamWang1102/FirstBranch

First branch