Merge branch 'master' of https://github.com/xiaerfei/Goslow

Conflicts:

GoSlowDemo/GoSlowDemo.xcodeproj/project.xcworkspace/xcshareddata/GoSlowD
emo.xccheckout
	GoSlowDemo/GoSlowDemo/AppDelegate.m
6887

dfdfsgsdg
Merge branch 'master' of https://github.com/xiaerfei/Goslow