Resolved merge conflicts.

README.md

@@ -1,34 +1,17 @@
 # MOK Project - Multilingual Onscreen Keyboard
 
-<<<<<<< HEAD
-## We Are Now Serving From A CDN!
-
-### You can now easily include this plugin right in your project without the need to have any code locally.
-=======
 ### We Are Now Serving From A CDN!
 
 #### You can now easily include this plugin right in your project without the need to have any code locally.
->>>>>>> develop
 
 Latest Version
 ```sh
 <script src="https://cdn.jsdelivr.net/npm/mok-project@latest/dist/main.js"></script>
-<<<<<<< HEAD
-
-=======
->>>>>>> develop
 <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/mok-project@latest/dist/styles.css">
 ```
 
 Current Version
 ```sh
-<<<<<<< HEAD
-<script src="https://cdn.jsdelivr.net/npm/mok-project@1.1.4/dist/main.js"></script>
-
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/mok-project@1.1.4/dist/styles.css">
-```
-
-=======
 <script src="https://cdn.jsdelivr.net/npm/mok-project@1.1.5/dist/main.js"></script>
 <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/mok-project@1.1.5/dist/styles.css">
 ```
@@ -37,7 +20,6 @@ _If no local languages file is found, the keyboard will pull languages from the
 
 <br>
 
->>>>>>> develop
 The goal of this project is to materialize a well-styled, onscreen keyboard capable of supporting numerous languages fed from .klc files generated by Microsoft Keyboard Layout Creator. This has proven to be the most-reliable source of unicode data along with dead keys and ligature support but I am willing to make revisions if a better source is found. Typical use cases for this application include terminals, kiosks, and other touch-point devices. I hope to provide the community with a valuable resource that only grows better with time and your support!
 
 [Super Basic Demo](http://www.seanmcquay.com/mok-project/sample-keyboard.htm)
@@ -102,27 +84,6 @@ $ gulp develop --sourcemaps
 
 This project was built and tested on jQuery 3.2 and is fed .klc files from [Microsoft Keyboard Layout Creator](https://www.microsoft.com/en-us/download/details.aspx?id=22339) V1.4.
 
-<<<<<<< HEAD
-## Usage
-
-To initiate an instance of the keyboard within your application you may include the following script:
-
-```sh
-<script src="https://cdn.jsdelivr.net/npm/mok-project@latest/dist/main.js"></script>
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/mok-project@latest/dist/styles.css">
-
-<script type="text/javascript">
-    $(document).ready(function() {
-        $(document).keyboard({
-            language: 'us',
-            keyboardPosition: 'bottom'
-        });
-    });
-</script>
-```
-
-=======
->>>>>>> develop
 #### Options
 
 | Option | Default Value | Information |
@@ -341,10 +302,7 @@ In this release I have addressed several issues related to how the keyboard hand
 * Added CDN serving capability!
 * Allow mapping from language system file name to native language name.
 * Added the ability to configure the keyboard to only activate on specified input fields.
-<<<<<<< HEAD
-=======
 
 #### Version 1.1.5
 
 * Revised code to search local languages first, then pull from CDN.
->>>>>>> develop