test mac
Merge branch 'master' of https://github.com/rayln1983/Plane

Conflicts:

Plane.xcodeproj/project.xcworkspace/xcuserdata/rayln.xcuserdatad/UserInt
erfaceState.xcuserstate