Pulling updates made by Øz.
Merge branch 'master' of https://github.com/IVProductions/Learn

Conflicts:
	.idea/workspace.xml

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Cordova-all-target-headers.hmap

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Cordova-own-target-headers.hmap

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Cordova-project-headers.hmap

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Cordova.hmap

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/CordovaLib.dep

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/CordovaLib~.dep

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVCommandDelegateImpl.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVCommandDelegateImpl.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVCommandQueue.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVCommandQueue.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVConfigParser.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVConfigParser.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVInvokedUrlCommand.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVInvokedUrlCommand.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVJSON.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVJSON.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVLocalStorage.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVLocalStorage.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVPlugin.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVPlugin.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVPluginResult.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVPluginResult.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVShared.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVShared.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVTimer.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVTimer.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVURLProtocol.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVURLProtocol.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVUserAgentUtil.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVUserAgentUtil.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVViewController.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVViewController.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVWebViewDelegate.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVWebViewDelegate.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVWhitelist.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/CDVWhitelist.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/Cordova.LinkFileList

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/NSArray+Comparisons.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/NSArray+Comparisons.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/NSData+Base64.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/NSData+Base64.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/NSDictionary+Extensions.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/NSDictionary+Extensions.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/NSMutableArray+QueueAdditions.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/NSMutableArray+QueueAdditions.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/UIDevice+Extensions.d

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/Objects-normal/i386/UIDevice+Extensions.o

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/build-state.dat

platforms/ios/CordovaLib/build/CordovaLib.build/Debug-iphonesimulator/Co
rdovaLib.build/build-state~.dat

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Learning-project-headers.hmap

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Learning.dep

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Learning.hmap

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Learning~.dep

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/AppDelegate.d

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/AppDelegate.o

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVAccelerometer.d

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVAccelerometer.o

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVConnection.d

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVConnection.o

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVDevice.d

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVDevice.o

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVNotification.d

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVNotification.o

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVReachability.d

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVReachability.o

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVVibration.d

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/CDVVibration.o

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/Learning.LinkFileList

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/Learning_dependency_info.dat

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/MainViewController.d

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/MainViewController.o

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/TTSPlugin.d

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/TTSPlugin.o

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/main.d

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
Objects-normal/i386/main.o

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
build-state.dat

platforms/ios/build/Learning.build/Debug-iphonesimulator/Learning.build/
build-state~.dat

platforms/ios/build/emulator/Learning.app.dSYM/Contents/Resources/DWARF/
Learning
	platforms/ios/build/emulator/Learning.app/Info.plist
	platforms/ios/build/emulator/Learning.app/Learning
	platforms/ios/build/emulator/Learning.app/MainViewController.nib

platforms/ios/build/emulator/Learning.app/www/app/services/learnService.
js
	platforms/ios/build/emulator/Learning.app/www/css/style.css
	platforms/ios/build/emulator/libCordova.a
	platforms/ios/cordova/console.log