.
Merge branch 'master' of https://github.com/chronicqazxc/ios_practice

Conflicts:

SimpleTable/SimpleTable.xcodeproj/project.xcworkspace/xcuserdata/wayne.x
cuserdatad/UserInterfaceState.xcuserstate