添加和修改内容到step2初始状态
fix the conflicts
Merge branch 'step2'

Conflicts:

app/PandoraDev.xcodeproj/project.xcworkspace/xcuserdata/moor.xcuserdatad
/UserInterfaceState.xcuserstate
完成step2内容的实验
完成最后的内容
fix some error