From cda3410ca91427411ee7d494b1e1f9b1aacaec06 Mon Sep 17 00:00:00 2001
From: Brendan Kirchner <brendankirchner@me.com>
Date: Wed, 28 Jun 2017 22:12:40 -0400
Subject: [PATCH 1/6] Update VFB 4E location

it was previously the same as 3W
---
 data/launchpads.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/launchpads.rb b/data/launchpads.rb
index 4e10f815..daccae1b 100644
--- a/data/launchpads.rb
+++ b/data/launchpads.rb
@@ -88,8 +88,8 @@
       location: {
         name: 'Vandenberg Air Force Base',
         region: 'California',
-        latitude: 34.6440904,
-        longitude: -120.5931438
+        latitude: 34.632093,
+        longitude: -120.610829
       },
       vehicles_launched: 'falcon 9',
       details: 'SpaceX primary west coast launch pad for polar orbits and sun synchronous orbits, primarily used for Iridium. Also intended to be capable of launching Falcon Heavy.'

From b42f7a32446884165bdde6f8e4818141a120701b Mon Sep 17 00:00:00 2001
From: Brendan Kirchner <brendankirchner@me.com>
Date: Thu, 29 Jun 2017 01:13:24 -0400
Subject: [PATCH 2/6] Tweak to engines_tested in test location

---
 data/launchpads.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/launchpads.rb b/data/launchpads.rb
index daccae1b..f6435ed7 100644
--- a/data/launchpads.rb
+++ b/data/launchpads.rb
@@ -7,10 +7,10 @@
         state: 'Texas',
         size_acres: 4000,
         year_built: 2003,
-        engines_tested: {
-          engine_1: 'Merlin',
-          engine_2: 'Draco'
-        },
+        engines_tested: [
+            'Merlin",
+            'Draco'
+        ],
         yearly_tests: 400,
         daily_tests: 2
     }

From d854a859e6a4c6a020c1a9398ebe8022f972ca38 Mon Sep 17 00:00:00 2001
From: Brendan Kirchner <brendankirchner@me.com>
Date: Thu, 29 Jun 2017 01:13:53 -0400
Subject: [PATCH 3/6] Fixed last commit

---
 data/launchpads.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/launchpads.rb b/data/launchpads.rb
index f6435ed7..bd88c37e 100644
--- a/data/launchpads.rb
+++ b/data/launchpads.rb
@@ -8,7 +8,7 @@
         size_acres: 4000,
         year_built: 2003,
         engines_tested: [
-            'Merlin",
+            'Merlin',
             'Draco'
         ],
         yearly_tests: 400,

From 2b3e5aef77f392f6b22cb240317df1ef501df0cf Mon Sep 17 00:00:00 2001
From: Brendan Kirchner <brendankirchner@me.com>
Date: Thu, 29 Jun 2017 01:34:13 -0400
Subject: [PATCH 4/6] Added location information for McGregor test facility

---
 data/launchpads.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/data/launchpads.rb b/data/launchpads.rb
index bd88c37e..cc66fb4b 100644
--- a/data/launchpads.rb
+++ b/data/launchpads.rb
@@ -3,10 +3,14 @@
     {
         id: 'RDF',
         name: 'Rocket Development Facility',
-        city: 'McGregor',
-        state: 'Texas',
         size_acres: 4000,
         year_built: 2003,
+        location: {
+            name: 'McGregor',
+            region: 'Texas',
+            latitude: 31.399045,
+            longitude: -97.462644
+        }
         engines_tested: [
             'Merlin',
             'Draco'

From 74a8b5c9f0001a3fcb163527c442d5b436a97e5a Mon Sep 17 00:00:00 2001
From: Brendan Kirchner <brendankirchner@me.com>
Date: Tue, 11 Jul 2017 00:53:08 -0400
Subject: [PATCH 5/6] Changed dragon thrust to kN

---
 data/dragon.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/dragon.rb b/data/dragon.rb
index 0e960232..584303eb 100644
--- a/data/dragon.rb
+++ b/data/dragon.rb
@@ -28,7 +28,7 @@
     fuel_1: 'nitrogen tetroxide',
     fuel_2: 'monomethylhydrazine',
     thrust: {
-      N: 400,
+      kN: 0.4,
       lbf: 90
     }
   },

From 33c74dacc9c84aad1e0fe6f49b21d28f2f2e8ab8 Mon Sep 17 00:00:00 2001
From: Brendan Kirchner <brendankirchner@me.com>
Date: Tue, 11 Jul 2017 00:55:21 -0400
Subject: [PATCH 6/6] Update launchpads.rb

---
 data/launchpads.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/data/launchpads.rb b/data/launchpads.rb
index 0dde27d3..2b8fa961 100644
--- a/data/launchpads.rb
+++ b/data/launchpads.rb
@@ -10,11 +10,7 @@
             region: 'Texas',
             latitude: 31.399045,
             longitude: -97.462644
-<<<<<<< HEAD
-        }
-=======
         },
->>>>>>> r-spacex/master
         engines_tested: [
             'Merlin',
             'Draco'