From bd2c098d4fab96732ae54f2b3aa18b00d7a8c417 Mon Sep 17 00:00:00 2001
From: Laura Colten <lauracolten5@gmail.com>
Date: Wed, 7 Nov 2018 19:48:53 -0600
Subject: [PATCH 1/2] created new branch

---
 05week/spaceTravelToMars.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/05week/spaceTravelToMars.js b/05week/spaceTravelToMars.js
index ce258a382..1947240bb 100644
--- a/05week/spaceTravelToMars.js
+++ b/05week/spaceTravelToMars.js
@@ -10,7 +10,16 @@ let jobTypes = {
 };
 
 // Your code here
+class CrewMember {
+  constructor(name, job, specialSkill, ship){
+    this.name = name;
+    this.job = job;
+    this.specialSkill = specialSkill;
+    this.ship = ship;
+  }
 
+}
+}
 //tests
 if (typeof describe === 'function'){
   describe('CrewMember', function(){

From ee2404879d85f30c73b96f00fbfe04b789bb8f3f Mon Sep 17 00:00:00 2001
From: Laura Colten <lauracolten5@gmail.com>
Date: Wed, 7 Nov 2018 21:45:25 -0600
Subject: [PATCH 2/2] finished spaceTravel

---
 05week/spaceTravelToMars.js | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/05week/spaceTravelToMars.js b/05week/spaceTravelToMars.js
index 1947240bb..177f46249 100644
--- a/05week/spaceTravelToMars.js
+++ b/05week/spaceTravelToMars.js
@@ -11,15 +11,47 @@ let jobTypes = {
 
 // Your code here
 class CrewMember {
-  constructor(name, job, specialSkill, ship){
+  constructor(name, job, specialSkill){
     this.name = name;
     this.job = job;
     this.specialSkill = specialSkill;
-    this.ship = ship;
+    this.crewMember = null;
   }
 
+  enterShip(ship) {
+    this.ship = ship;
+    ship.crew.push(this);
+  }
 }
+
+const crewMember1 = new CrewMember("Rick Martinez", "pilot", "chemistry");
+const crewMember2 = new CrewMember("Commander Lewis", "commander", "geology");
+
+
+class Ship {
+  constructor(name, type, ability) {
+    this.name = name;
+    this.type = type;
+    this.ability = ability;
+     this.crew = [];
+  }
+
+  missionStatement() {
+    if (this.crew.length) {
+      return this.ability;
+    }
+    else 
+      return "Can't perform a mission yet.";
+  }
 }
+
+const mav = new Ship("Mars Ascent Vehicle", "MAV", "Ascend into low orbit");
+const hermes = new Ship("Hermes", "Main Ship", "Interplanetary Space Travel");
+
+
+crewMember1.enterShip(mav);
+crewMember2.enterShip(hermes);
+
 //tests
 if (typeof describe === 'function'){
   describe('CrewMember', function(){