Merge branch 'master' of https://github.com/butandingboben/Pigeon-v.1.1

Conflicts:
	Pigeon v.1.1/ViewController.m