asd
Merge branch 'master' of https://github.com/IVProductions/Learn

Conflicts:

platforms/ios/Ping.xcodeproj/project.xcworkspace/xcuserdata/simonhordvik
.xcuserdatad/UserInterfaceState.xcuserstate