Merge pull request #15 from suntinghui/master

jiaaa
多余线
Merge branch 'master' of https://github.com/liaojia/LKOA4iPhone into liaojia-master

Conflicts:
	LKOA4iPhone/Source/ViewController/XXZXViewController.m