test3
test6
Merge branch 'master' of https://github.com/Chenjm08/GitTest

Conflicts:
	GitTest/ViewController.m
Revert "yaoliang"

Conflicts:
	GitTest/ViewController.m
修改冲突