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

Conflicts:
	.idea/workspace.xml

platforms/ios/Learning.xcodeproj/project.xcworkspace/xcuserdata/simonhor
dvik.xcuserdatad/UserInterfaceState.xcuserstate
	platforms/ios/cordova/console.log