change code by ly
Merge branch 'master' of https://github.com/bigpig1010/hellogithub

Conflicts:
	hellogithub/ViewController.m