github
Merge branch 'master' of https://github.com/yuyedaidao/YQPrensetViewController

Conflicts:
	LICENSE
	README.md