From 07780caba046f3e58473fcd1cf0b51a7f93e9a09 Mon Sep 17 00:00:00 2001
From: kshields412 <kshields412@gmail.com>
Date: Mon, 2 Dec 2019 17:10:00 -0500
Subject: [PATCH 1/2] completed lab

---
 .idea/.gitignore     |  3 +++
 .idea/JSON-Lab-1.iml |  9 +++++++++
 .idea/misc.xml       |  6 ++++++
 .idea/modules.xml    |  8 ++++++++
 .idea/vcs.xml        |  6 ++++++
 js/colors.js         | 29 +++++++++++++++--------------
 6 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/JSON-Lab-1.iml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/JSON-Lab-1.iml b/.idea/JSON-Lab-1.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/JSON-Lab-1.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..a5b9dac
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/JSON-Lab-1.iml" filepath="$PROJECT_DIR$/.idea/JSON-Lab-1.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/js/colors.js b/js/colors.js
index 6e4f350..965564d 100644
--- a/js/colors.js
+++ b/js/colors.js
@@ -1,10 +1,10 @@
-var colorsArray : {
-    colors=[
+var colorsArray={
+    colors:[
         {
             "name":"green",
             "red":"64",
             "green":"175",
-            "blue":"63",
+            "blue":"63"
         },
         {
             "name":"yellow",
@@ -13,21 +13,22 @@ var colorsArray : {
             "blue":"62"
         },
         {
-            name:"red",
-            red:"192",
-            green:"46",
-            blue:"35"
-        }
+            "name":"red",
+            "red":"192",
+            "green":"46",
+            "blue":"35"
+        },
         {
             "name":"blue",
             "red":"19",
             "green":"71",
-            "blue":"144",
+            "blue":"144"
         },
         {
-            "name"="orange",
-            "red"="253",
-            "green"="92",
-            "blue"="48"
-        },
+            "name":"orange",
+            "red":"253",
+            "green":"92",
+            "blue":"48"
+        }
     ]
+}

From 3bd50d458a5e72392609e08fa5929e8cd5b8994e Mon Sep 17 00:00:00 2001
From: kshields412 <kshields412@gmail.com>
Date: Mon, 2 Dec 2019 17:28:12 -0500
Subject: [PATCH 2/2] completed lab

---
 js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/index.js b/js/index.js
index 396b2e7..276ffc5 100644
--- a/js/index.js
+++ b/js/index.js
@@ -1,6 +1,6 @@
 //Function to grab random int between min - max
 var randomInt = function (min, max) {
-  return Math.floor(Math.random() * (max - min + 1)) + min;
+	return Math.floor(Math.random() * (max - min + 1)) + min;
 }
 
 window.onload = function()