添加readme
Merge branch 'f1'
f2
no message
f4
f5
Merge branch 'f2'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/dreamlx/ios_giftedbase