Merge branch 'develop' of https://github.com/bfeist/Apollo17.org into…

… ted_styling

Conflicts:
	MISSION_DATA/photos.csv
	MISSION_DATA/photos.xlsx

.gitignore

@@ -1,4 +1,6 @@
 /.idea
 /_Website/_webroot/mission_images
 /_AFJ/_webroot/segments
-/_AFJ/_webroot/TOC.html
+/_AFJ/_webroot/TOC.html
+/_Website/Archive/flickr
+/_Website/assets/mission_images_lightroom/

MISSION_DATA/Mission TOC.csv

@@ -2,7 +2,7 @@
 -01:15:01|2|Countdown Cutoff|
 -00:07:59|2|Countdown Resumes|
 -00:01:00|2|One Minute to Launch|
-000:00:00|1|Lift-off (Range zero = 342:05:33:00 GMT)|
+000:00:00|1|Lift-off|
 000:02:34|2|S-II Staging|
 000:09:20|2|S-IVB Staging|
 000:11:54|1|Earth orbit insertion|
@@ -18,17 +18,20 @@
 004:45:06|2|Spacecraft ejection|
 004:49:53|3|Video: S-IVB visible|
 005:49:50|2|Photographing Earth - \"fragile-appearing piece of blue\"|
+005:52:25|2|Schmitt: \"I'm not keeping you awake, am I?\"|
 009:00:01|1|Crew Sleep Period Start|
 015:02:45|1|Crew wake-up|
+018:02:55|1|News read to crew|
+021:14:57|2|Cernan describes launch experience|
 024:51:32|2|Jack Schmitt philosophical about observing the earth|
 025:26:26|1|Crew Sleep Period Start|
 033:00:38|1|Crew wake-up|
 034:10:07|2|Video: crew onboard film|
+034:10:07|2|News read to crew|
 035:30:00|1|First mid-course correction|
 037:00:40|2|Crew listening to music|
-042:57:34|2|Video: Start of onboard heat flow and convection experiment|
+042:59:32|2|Video: Start of onboard heat flow and convection experiment|
 045:30:18|2|Video: Continuation of onboard heat flow and convection experiment|
-048:14:48|2|Video: Earth and moon|
 048:36:12|1|Crew Sleep Period Start|
 056:35:40|1|Crew wake-up with music (Difficulty waking up)|
 059:57:53|2|Entering the LM 2nd time|
@@ -38,33 +41,35 @@
 069:25:48|2|Schmitt asks a difficult flight dynamics question|
 073:47:15|1|Crew Sleep Period Start|
 081:30:28|1|Crew wake-up|
-084:10:12|2|Video: Film of lunar approach|
 084:12:45|2|Scientific instrument module door jettison|
 086:46:30|2|Crew can see the moon for the first time|
 087:47:06|2|Jack Schmitt "speechless"|
+089:09:01|3|Video: Far side of the moon|
 089:40:03|2|S-IVB lunar impact|
 090:18:11|2|\"Flash\" observed on the lunar surface|
 093:35:00|1|Descent orbit insertion reported|
 106:09:09|2|Video: Earth and moon through telescope|
-110:27:56|1|Lunar Module undocking and separation|
-112:04:28|1|Video: Lunar undocking (Far side, no audio)|
-112:38:07|2|Video: Command Module from LM|
-112:49:49|1|Video: Powered Descent Initiation for Lunar landing|
-112:52:08|2|Initiate Lunar landing|
+110:08:00|1|Lunar Module undocking and separation|(Far side, no audio)
+110:47:34|1|Video: Command Module from LM|
+112:49:49|1|Video: Powered Descent Initiation|
+112:52:08|2|Begin Lunar landing|
 112:57:48|3|Video: Landing camera on|
 113:02:13|2|Landed at Taurus-Littrow|
 113:43:51|2|Post-landing Activities|
-115:17:12|1|EVA-1|
+115:17:12|1|EVA-1 Start|
 117:01:38|2|EVA-1 Watches started|
-117:10:42|2|Video: Down the Ladder|
+117:10:42|2|Down the Ladder|
+117:11:35|3|Video: 16mm Film|
 117:14:50|3|\"Don't lock the hatch\"|
 117:18:57|3|Jack Schmitt challenges the next generation|
 117:24:50|2|Rover Deployment|
-117:31:09|3|Lunar roving vehicle offloaded|
-117:44:16|3|Lunar roving vehicle deployed|Test drive performed and documented with photography, gathered samples and performed 500-mm and panoramic photography.
-118:14:02|2|Video: EVA broadcast from lunar surface begins|
+117:31:09|3|Lunar Roving Vehicle (LRV) offloaded|
+117:44:16|3|LRV deployed|Test drive performed and documented with photography, gathered samples and performed 500-mm and panoramic photography.
+117:48:24|3|LRV Test Drive|
+118:14:02|2|Video: First television from lunar surface|
 118:21:57|2|United States flag deployed|Flag documented with photographs and stereo photography.
 118:34:43|2|Cosmic ray experiment deployed|
+120:39:38|2|Cernan: \"who's winning the football game?\"|
 120:46:06|2|ALSEP deployed|Documented with photographs and panoramic photography.
 120:59:30|2|Deep core sample|Lunar neutron probe experiment deployed.
 121:01:07|3|Schmitt falls while retreiving the deep core sample|
@@ -82,17 +87,17 @@
 128:54:10|1|Surface Crew sleep period|
 136:26:58|2|Communications with Ron Evans in lunar orbit|
 136:55:03|1|Surface Crew wake-up (music)|
-138:28:37|1|EVA-2|
-140:34:20|2|EVA-2 Start|
-140:45:41|2|Video from EVA-2 begins|
-141:19:00|3|Lunar roving vehicle loaded for traverse|
-141:21:55|2|Departed for Surface Electrical Properties experiment site|
-141:27:05|2|Arrived at Surface Electrical Properties experiment site|Activated experiment, gathered samples, and performed panoramic photography.
+138:28:37|1|EVA-2 Start|
+140:34:20|2|EVA-2 Watches started|
+140:45:41|2|Video: EVA-2|
+141:19:00|3|LRV loaded for traverse|
+141:21:55|2|Departed for SEP experiment site|
+141:27:05|2|Arrived at SEP site|Activated experiment, gathered samples, and performed panoramic photography.
 141:31:48|2|Departed for Station 2 (South Massif)|Four short stops; one to deploy seismic profiling experiment explosive charge 4, and three to gather enroute samples.
 142:45:50|2|Video: Arrived at Station 2|Gathered samples including a rake sample, and performed documentary and panoramic photography.
 142:50:48|3|Cernan dusts lens at Station 2 "can I change your oil?"|
 142:59:45|3|Cernan "busting my butt"|
-143:19:40|3|Camera on "mother earth" - "isn't that pretty"|
+143:19:40|3|Camera on "mother earth"|
 143:22:30|3|\"You know, I look out there, I'm not sure I really believe it all.\"|
 143:26:13|3|\"Maybe time's different in space. Adventures in space and time.\"|
 143:40:44|3|\"One-scoop-Schmitt, they call me.\"|
@@ -110,40 +115,42 @@
 146:50:38|3|Cernan hopping along and singing|
 146:55:57|2|Departed for the Lunar Module|Includes short stop to deploy seismic profiling experiment explosive charge 8 documented with photographs, and a stop at the lunar surface experiments site to allow the Lunar Module Pilot to relevel the lunar surface gravimeter experiment.
 147:12:23|2|Arrived at the Lunar Module|Started extravehicular activity closeout.
+147:37:40|3|Gene shooting with the 500mm|
 147:52:04|3|Dusting the camera and philosophizing|
 148:09:47|2|Lunar Module cabin repressurization|
 150:46:12|1|Crew listens to news while eating dinner|
 152:25:20|1|Surface Crew sleep period begins|Ron Evans continues activities in orbit.
 154:40:23|2|Communications with Ron Evans in lunar orbit|
 160:24:02|1|Surface Crew wake-up|
-163:32:48|1|EVA-3|
-163:33:40|2|EVA-3 Start|
-163:46:15|3|Video from EVA-3 begins|
-163:56:11|2|Lunar roving vehicle loaded for traverse|Performed panoramic and 500mm photography.
+163:32:48|1|EVA-3 Start|
+163:33:40|2|EVA-3 Watches started|
+163:46:15|3|Video: EVA-3|
+163:56:11|2|LRV loaded for traverse|Performed panoramic and 500mm photography.
 164:00:16|2|Cosmic ray experiment retrieved|
 164:07:08|3|Jack Schmitt, "Tallest man on the moon"|
-164:11:19|2|Departed for Surface Electrical Properties experiment site|
-164:19:08|2|Arrived at Surface Electrical Properties experiment site|Activated the experiment, gathered samples, and performed documentary photography.
-164:22:36|2|Departed for Station 6 (Tracy's Rock)|Two short stops to gather enroute samples|
+164:11:19|2|Departed for SEP site|
+164:18:35|2|Arrived at SEP site|Activated the experiment, gathered samples, and performed documentary photography.
+164:22:32|2|Departed for Station 6 (Tracy's Rock)|Two short stops to gather enroute samples|
 164:53:10|2|Video: Arrived at Station 6|Gathered samples including a single core tube sample and a rake sample, and performed documentary, panoramic, and 500-mm photography.
 165:00:57|3|Schmitt's face visible on video|
 165:08:00|3|Hammering boulder to retrieve fragments|
 165:36:42|3|Cernan falls|
 165:36:54|3|\"Remind me to dust my camera\"|
-166:00:28|2|Departed for Station 7|
+165:48:27|3|Photo: Lunar Module in the far distance|
+166:05:36|2|Departed for Station 7|
 166:11:00|2|Video: Arrived at Station 7|Gathered samples and performed documentary and panoramic photography.
 166:29:50|2|Departed for Station 8 (Sculptured Hills)|One short stop to gather enroute samples.
 166:50:01|2|Video: Arrived at Station 8|Gathered samples including rake and trench samples, and performed documentary and panoramic photography.
 166:51:21|3|\"I think your LMP just ran away\"|
-167:06:57|3|Jack running and bouncing down hill|
+167:06:57|3|Jack running|
 167:07:26|3|Jack skis down hill|
-167:10:03|3|Cernan's two legged hopping, "I can cover ground like a kangaroo"|
+167:10:03|3|Cernan: "I can cover ground like a kangaroo"|
 167:32:28|2|Departed for Station 9 (Van Serg Crater)|
 167:34:44|3|Trying to blow dust off the camera|
 167:55:48|2|Video: Arrived at Station 9|Seismic profiling experiment explosive charge 5 deployed, two traverse gravimeter experiment readings obtained, gathered samples including a trench sample and a double coretube sample, and performed documentary, panoramic, and 500-mm photography. Removed data storage electronics assembly from Surface Electrical Properties receiver.
 168:02:23|3|Singing \"Tiptoe Through the Tulips\"|
 168:04:32|3|Standing on cliff giving geology observations|
-168:20:48|3|Cernan, alone in the far distance|
+168:20:48|3|Simultaneous panoramas|
 168:45:57|3|Capcom asks about strange object in camera view|
 168:47:07|2|Return to the Lunar Module|Two short stops, one to gather enroute samples and the other to deploy seismic profiling experiment explosive charge 2 and perform documentary and panoramic photography.
 169:15:19|3|Schmitt, \"Need your oil changed?\"|
@@ -152,11 +159,10 @@
 169:46:50|3|Uncovering of the plaque|
 169:51:44|3|Throwing object|
 170:13:58|2|ALSEP photography completed|
-170:16:43|2|Lunar neutron probe experiment retrieved|
-170:19:57|2|Lunar roving vehicle positioned to monitor Lunar Module ascent|
-170:21:37|3|Schmitt in the far distance near the LM from the final position of the rover|
-170:22:08|3|Cernan's speech about aerospace industry|
-170:27:29|3|Distant shot of Cernan walking back|
+170:19:57|2|LRV Parked|
+170:21:41|3|Schmitt waking back to LM|
+170:22:08|3|Cernan's speech about aerospace|
+170:28:20|3|Cernan walking back to LM|
 170:29:59|3|Schmitt throws his geology hammer|
 170:39:36|3|Video shot of Earth|
 170:41:17|3|Cernan's Last Steps speech|
@@ -178,13 +184,13 @@
 188:58:15|2|Terminal phase initiation|
 189:36:22|1|Video: Beginning rendezvous with Command Module|
 189:41:32|2|"Good to see you"|
-190:01:21|1|Video: Preparation for Lunar Docking|
+190:01:41|1|Video: Preparation for Lunar Docking|
 190:17:34|2|Lunar Docking|
 190:20:42|2|Message from the President|
 190:41:30|2|Hatch opened and crew reunited|
 192:37:04|3|Challenger (LM) closeout|
 193:39:04|3|Cernan and Schmitt playfully teasing Evans|
-193:58:33|2|Lunar Module jettison|
+193:58:03|2|Video: Lunar Module jettison|
 194:03:31|1|Separation maneuver|
 195:38:31|2|Lunar Module deorbit firing|
 195:52:44|2|Lunar Module impact|
@@ -240,15 +246,14 @@
 301:00:30|2|Christmas spirit. \"Looks like it's really snowing\" (out the window)|
 301:17:18|1|Second midcourse correction|
 304:03:40|1|Command module/service module separation|
-304:17:46|1|Reentery into Earth's atmosphere (400,000 feet, 32,000 feet per second)|
-304:18:57|2|Video: Begin reentry blackout|
-304:22:52|2|End reentry blackout|
-304:26:20|2|Forward heat shield jettison|
-304:26:22|2|Drogue deployment|
-304:27:14|2|Main parachute deployment|
-304:28:55|2|Three minutes to splashdown|
+304:17:46|1|Reentery begins|
+304:18:57|2|Video: Begin blackout|
+304:26:22|2|Drogue chute|
+304:27:14|2|Main parachute|
+304:28:55|2|Pre-splashdown|
 304:31:50|1|Splashdown|
-304:33:44|1|Crew retrieval by ELS swimmers|
+304:22:33|2|Video: Mission Control|
+304:33:44|1|Crew retrieval|
 305:22:35|1|Crew onboard USS Ticonderoga|
 305:27:32|1|Speeches by the crew|
 305:35:24|0|End of coverage|