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

Conflicts:

ChartDemo/ChartDemo.xcworkspace/xcuserdata/wayne.xcuserdatad/UserInterfa
ceState.xcuserstate

TableViewInsertCellDemo/TableViewInsertCellDemo.xcodeproj/project.xcwork
space/xcshareddata/TableViewInsertCellDemo.xccheckout

TableViewInsertCellDemo/TableViewInsertCellDemo.xcodeproj/project.xcwork
space/xcuserdata/wayne.xcuserdatad/UserInterfaceState.xcuserstate