2014.11.11 20:35

推荐页面 和 选择城市页面
Merge branch 'master' of https://github.com/xiaerfei/Goslow

Conflicts:
	GoSlowDemo/GoSlowDemo.xcodeproj/project.pbxproj

GoSlowDemo/GoSlowDemo.xcodeproj/project.xcworkspace/xcshareddata/GoSlowD
emo.xccheckout