a
Merge branch 'master' of https://github.com/shenlujia/iOS

Conflicts:
	.gitignore