From 151b0a5fc352347468a668f6d10d42277dc55f78 Mon Sep 17 00:00:00 2001
From: lolcookie <20769605@student.uwa.edu.au>
Date: Sun, 29 Nov 2015 21:15:53 +0800
Subject: [PATCH 1/7] Create CNAME

---
 CNAME | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 CNAME

diff --git a/CNAME b/CNAME
new file mode 100644
index 0000000..1bcbb33
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+calc.splatoon.ink

From 855d5b240ec5fc9c7b1c0f569b09ae51d805d0a6 Mon Sep 17 00:00:00 2001
From: Dylan <20769605@student.uwa.edu.au>
Date: Sun, 29 Nov 2015 21:19:49 +0800
Subject: [PATCH 2/7] fixed modal

---
 index.html         | 2 +-
 main.controller.js | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 5592510..08702c3 100644
--- a/index.html
+++ b/index.html
@@ -36,7 +36,7 @@ <h1>Splatoon Calculator</h1>
 
 
 <div class="container" ng-controller="MainCtrl">
-  <modal title="Error" visible="showModal">
+  <modal title="Errorbox" visible="showModal">
   </modal>
 
 
diff --git a/main.controller.js b/main.controller.js
index b36c39f..ff0170a 100644
--- a/main.controller.js
+++ b/main.controller.js
@@ -142,7 +142,10 @@ splatoonApp.directive('modal', function () {
                 '<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
                 '<h4 class="modal-title">{{ ErrorMessage }}</h4>' +
 								'</div>' +
-	              '<div class="modal-body" ng-transclude></div>' +
+								'<div class="modal-body">' +
+									'<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>' +
+									'</div>' +
+								'</div>' +
 	            '</div>' +
 	          '</div>' +
 	        '</div>',

From 8649e7c70e7de1ddd8bf738439c8b1aff41b4505 Mon Sep 17 00:00:00 2001
From: lolcookie <20769605@student.uwa.edu.au>
Date: Sun, 29 Nov 2015 21:27:00 +0800
Subject: [PATCH 3/7] Update CNAME

---
 CNAME | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CNAME b/CNAME
index 1bcbb33..8b13789 100644
--- a/CNAME
+++ b/CNAME
@@ -1 +1 @@
-calc.splatoon.ink
+

From 1e9ad7722f9b34660f6d7308ce36d76d4cb78420 Mon Sep 17 00:00:00 2001
From: Dylan <20769605@student.uwa.edu.au>
Date: Sun, 29 Nov 2015 21:28:27 +0800
Subject: [PATCH 4/7] add .gitignore for CNAME

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9dcc7ed
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+CNAME

From cd04418e823ca335838dc3e44c1e29bbb4b48a14 Mon Sep 17 00:00:00 2001
From: Dylan <20769605@student.uwa.edu.au>
Date: Sun, 29 Nov 2015 22:02:34 +0800
Subject: [PATCH 5/7] merge

---
 CNAME | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CNAME b/CNAME
index 8b13789..f9a4738 100644
--- a/CNAME
+++ b/CNAME
@@ -1 +1,2 @@
+calc.splatoon.ink
 

From 6b62cf8b9d95e3c2e03c330bdb7cb3a890e040fd Mon Sep 17 00:00:00 2001
From: Dylan <20769605@student.uwa.edu.au>
Date: Mon, 30 Nov 2015 17:04:56 +0800
Subject: [PATCH 6/7] changed movement speeds to u/s instead of %

---
 stats.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stats.js b/stats.js
index bb74527..d5d2bdf 100644
--- a/stats.js
+++ b/stats.js
@@ -53,10 +53,10 @@ angular.module('splatoonApp').stats = function ($scope) {
     new Stat("Bomb Throw Range", "%", 0, 150, 60, function (x) {
         this.value = Math.min(this.max, (156.8 * (1 + x))/156.8*100);
     }),
-    new Stat("Run Speed", "%", 0, 144, 60, function (x) {
+    new Stat("Run Speed", " u/s", 0, 144, 60, function (x) {
         this.value = Math.min(this.max, 96 * (1 + x));
     }),
-    new Stat("Swim Speed", "%", 0, 240, 120, function (x) {
+    new Stat("Swim Speed", " u/s", 0, 240, 120, function (x) {
         this.value = Math.min(this.max, 192 * (1 + x));
     }),
     new Stat("Special Charge", "%", 0, 130, 100, function (x) {

From a79f983a2331ae7fbd10f5c246df7d75a5c64d4b Mon Sep 17 00:00:00 2001
From: Dylan <20769605@student.uwa.edu.au>
Date: Mon, 30 Nov 2015 17:25:28 +0800
Subject: [PATCH 7/7] modal near centre of screen

---
 index.html |  2 +-
 styles.css | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index 08702c3..341c032 100644
--- a/index.html
+++ b/index.html
@@ -36,7 +36,7 @@ <h1>Splatoon Calculator</h1>
 
 
 <div class="container" ng-controller="MainCtrl">
-  <modal title="Errorbox" visible="showModal">
+  <modal title="Errorbox" visible="showModal" id="modal">
   </modal>
 
 
diff --git a/styles.css b/styles.css
index 1c034d2..e1c86eb 100644
--- a/styles.css
+++ b/styles.css
@@ -1,16 +1,11 @@
+#modal {
+  top: 30%;
+}
+
 .h1 {
   text-align: center;
 }
-#banner {
-    border-bottom: none;
-    margin-top: -20px;
-}
 
-#banner h1 {
-    font-size: 60px;
-    line-height: 1;
-    letter-spacing: -1px;
-}
 .thing-form {
     margin: 20px 0;
 }