111
Merge branch 'master' of github.com:NightWish8888/baifumei

Conflicts:
	baifumei/baifumei/ViewController.m
dd